Index: framework/webtools/template/artifactinfo/ArtifactInfo.ftl
===================================================================
--- framework/webtools/template/artifactinfo/ArtifactInfo.ftl	(revision 0)
+++ framework/webtools/template/artifactinfo/ArtifactInfo.ftl	(revision 0)
@@ -0,0 +1,439 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if sessionAttributes.recentArtifactInfoList?has_content>
+  <div class="right">
+    <h2>Recently Viewed Artifacts:</h2>
+    <#assign highRef = sessionAttributes.recentArtifactInfoList.size() - 1/>
+    <#if (highRef > 19)><#assign highRef = 19/></#if>
+    <#list sessionAttributes.recentArtifactInfoList[0..highRef] as recentArtifactInfo>
+        <div>${recentArtifactInfo_index + 1} - ${recentArtifactInfo.type}: <@displayArtifactInfoLink type=recentArtifactInfo.type uniqueId=recentArtifactInfo.uniqueId displayName=recentArtifactInfo.displayName/></div>
+    </#list>
+  </div>
+</#if>
+
+<#if !artifactInfo??>
+
+    <#-- add form here to specify artifact info name. -->
+    <div>
+      <form name="ArtifactInfoByName" method="post" action="<@ofbizUrl>ArtifactInfo</@ofbizUrl>" class="basic-form">
+        Search Names/Locations: <input type="text" name="name" value="${parameters.name!}" size="40"/>
+        <select name="type">
+          <option></option>
+          <option>entity</option>
+          <option>service</option>
+          <option>form</option>
+          <option>screen</option>
+          <option>request</option>
+          <option>view</option>
+        </select>
+        <input type="hidden" name="findType" value="search"/>
+        <input type="submit" name="submitButton" value="Find"/>
+      </form>
+    </div>
+    <div>
+      <form name="ArtifactInfoByNameAndType" method="post" action="<@ofbizUrl>ArtifactInfo</@ofbizUrl>" class="basic-form">
+        <div>Name: <input type="text" name="name" value="${parameters.name!}" size="40"/></div>
+        <div>Location: <input type="text" name="location" value="${parameters.location!}" size="60"/></div>
+        <div>Type:
+          <select name="type">
+            <option>entity</option>
+            <option>service</option>
+            <option>form</option>
+            <option>screen</option>
+            <option>request</option>
+            <option>view</option>
+          </select>
+          <input type="submit" name="submitButton" value="Lookup"/>
+        </div>
+      </form>
+    </div>
+
+    <#-- add set of ArtifactInfo if there is not a single one identified, with link to each -->
+    <#if artifactInfoSet?has_content>
+    <div>
+        <h4>Multiple Artifacts Found:</h4>
+        <#list artifactInfoSet as curArtifactInfo>
+            <div>${curArtifactInfo.getDisplayType()}: <@displayArtifactInfo artifactInfo=curArtifactInfo/></div>
+        </#list>
+    </div>
+    </#if>
+
+<#else/>
+
+    <h1>${uiLabelMap.WebtoolsArtifactInfo} (${artifactInfo.getDisplayType()}): ${artifactInfo.getDisplayName()}</h1>
+    <#if artifactInfo.getLocationURL()??>
+        <div>Defined in: <a href="${artifactInfo.getLocationURL()}">${artifactInfo.getLocationURL()}</a></div>
+    </#if>
+
+    <#if artifactInfo.getType() == "entity">
+        <div><a href="<@ofbizUrl>FindGeneric?entityName=${artifactInfo.modelEntity.getEntityName()}&amp;find=true&amp;VIEW_SIZE=50&amp;VIEW_INDEX=0</@ofbizUrl>">All Entity Data</a></div>
+        <h2>Entity Fields</h2>
+        <table>
+        <#list artifactInfo.modelEntity.getFieldsUnmodifiable() as modelField>
+            <tr><td>${modelField.getName()}<#if modelField.getIsPk()>*</#if></td><td>${modelField.getType()}</td><td>${modelField.getDescription()!}</td></tr>
+        </#list>
+        </table>
+
+        <div>
+        <h2>Entities Related (One)</h2>
+        <#list artifactInfo.getEntitiesRelatedOne()! as entityArtifactInfo>
+            <@displayEntityArtifactInfo entityArtifactInfo=entityArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Entities Related (Many)</h2>
+        <#list artifactInfo.getEntitiesRelatedMany()! as entityArtifactInfo>
+            <@displayEntityArtifactInfo entityArtifactInfo=entityArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Services Using This Entity</h2>
+        <#list artifactInfo.getServicesUsingEntity()! as serviceArtifactInfo>
+            <@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Forms Using This Entity</h2>
+        <#list artifactInfo.getFormsUsingEntity()! as formWidgetArtifactInfo>
+            <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Screens Using This Entity</h2>
+        <#list artifactInfo.getScreensUsingEntity()! as screenWidgetArtifactInfo>
+            <@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
+        </#list>
+        </div>
+
+    <#elseif artifactInfo.getType() == "service"/>
+        <h2>Service Info</h2>
+        <div>&nbsp;Description: ${artifactInfo.modelService.description}</div>
+        <div>&nbsp;Run (${artifactInfo.modelService.engineName}): ${artifactInfo.modelService.location} :: ${artifactInfo.modelService.invoke}</div>
+        <div>&nbsp;Impl Location: <a href="${artifactInfo.getImplementationLocationURL()!}">${artifactInfo.getImplementationLocationURL()!}</a></div>
+        <h2>Service Parameters</h2>
+        <table>
+            <tr><td>Name</td><td>Type</td><td>Optional</td><td>Mode</td><td>Entity.field</td></tr>
+        <#list artifactInfo.modelService.getAllParamNames() as paramName>
+            <#assign modelParam = artifactInfo.modelService.getParam(paramName)/>
+            <tr><td>${modelParam.getName()}<#if modelParam.getInternal()> (internal)</#if></td><td>${modelParam.getType()}</td><td><#if modelParam.isOptional()>optional<#else/>required</#if></td><td>${modelParam.getMode()}</td><td>${modelParam.getEntityName()!}.${modelParam.getFieldName()!}</td></tr>
+        </#list>
+        </table>
+
+        <div>
+        <h2>Entities Used By This Service</h2>
+        <#list artifactInfo.getEntitiesUsedByService()! as entityArtifactInfo>
+            <@displayEntityArtifactInfo entityArtifactInfo=entityArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Services Calling This Service</h2>
+        <#list artifactInfo.getServicesCallingService()! as serviceArtifactInfo>
+            <@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Services Called By This Service</h2>
+        <#list artifactInfo.getServicesCalledByService()! as serviceArtifactInfo>
+            <@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Service ECA Rules Triggered By This Service</h2>
+        <#list artifactInfo.getServiceEcaRulesTriggeredByService()! as serviceEcaArtifactInfo>
+            <@displayServiceEcaArtifactInfo serviceEcaArtifactInfo=serviceEcaArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Service ECA Rules Calling This Service</h2>
+        <#list artifactInfo.getServiceEcaRulesCallingService()! as serviceEcaArtifactInfo>
+            <@displayServiceEcaArtifactInfo serviceEcaArtifactInfo=serviceEcaArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Forms Calling This Service</h2>
+        <#list artifactInfo.getFormsCallingService()! as formWidgetArtifactInfo>
+            <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Forms Based On This Service</h2>
+        <#list artifactInfo.getFormsBasedOnService()! as formWidgetArtifactInfo>
+            <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Screens Calling This Service</h2>
+        <#list artifactInfo.getScreensCallingService()! as screenWidgetArtifactInfo>
+            <@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Requests with Events That Call This Service</h2>
+        <#list artifactInfo.getRequestsWithEventCallingService()! as controllerRequestArtifactInfo>
+            <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
+        </#list>
+        </div>
+
+    <#elseif artifactInfo.getType() == "form"/>
+        <div>
+        <h2>Form Extended by This Form</h2>
+        <#if artifactInfo.getFormThisFormExtends()??>
+            <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=artifactInfo.getFormThisFormExtends()/>
+        </#if>
+        </div>
+
+        <div>
+        <h2>Entities Used in This Form</h2>
+        <#list artifactInfo.getEntitiesUsedInForm()! as entityArtifactInfo>
+            <@displayEntityArtifactInfo entityArtifactInfo=entityArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Services Used in This Form</h2>
+        <#list artifactInfo.getServicesUsedInForm()! as serviceArtifactInfo>
+            <@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Forms Extending This Form</h2>
+        <#list artifactInfo.getFormsExtendingThisForm()! as formWidgetArtifactInfo>
+            <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Screens Including This Form</h2>
+        <#list artifactInfo.getScreensIncludingThisForm()! as screenWidgetArtifactInfo>
+            <@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Controller Requests That Are Linked to in This Form</h2>
+        <#list artifactInfo.getRequestsLinkedToInForm()! as controllerRequestArtifactInfo>
+            <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
+        </#list>
+        </div>
+        <div>
+        <h2>Controller Requests That Are Targeted By This Form</h2>
+        <#list artifactInfo.getRequestsTargetedByForm()! as controllerRequestArtifactInfo>
+            <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
+        </#list>
+        </div>
+
+    <#elseif artifactInfo.getType() == "screen"/>
+        <div>
+        <h2>Entities Used in This Screen</h2>
+        <#list artifactInfo.getEntitiesUsedInScreen()! as entityArtifactInfo>
+            <@displayEntityArtifactInfo entityArtifactInfo=entityArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Services Used in This Screen</h2>
+        <#list artifactInfo.getServicesUsedInScreen()! as serviceArtifactInfo>
+            <@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Forms Included in This Screen</h2>
+        <#list artifactInfo.getFormsIncludedInScreen()! as formWidgetArtifactInfo>
+            <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Screens Include in This Screen</h2>
+        <#list artifactInfo.getScreensIncludedInScreen()! as screenWidgetArtifactInfo>
+            <@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Screens Including This Screen</h2>
+        <#list artifactInfo.getScreensIncludingThisScreen()! as screenWidgetArtifactInfo>
+            <@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Controller Requests That Are Linked to in This Screen</h2>
+        <#list artifactInfo.getRequestsLinkedToInScreen()! as controllerRequestArtifactInfo>
+            <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Controller Views Referring to This Screen</h2>
+        <#list artifactInfo.getViewsReferringToScreen()! as controllerViewArtifactInfo>
+            <@displayControllerViewArtifactInfo controllerViewArtifactInfo=controllerViewArtifactInfo/>
+        </#list>
+        </div>
+
+    <#elseif artifactInfo.getType() == "request"/>
+        <#if artifactInfo.getServiceCalledByRequestEvent()??>
+            <div>
+            <h2>Service Called by Request Event</h2>
+            <@displayServiceArtifactInfo serviceArtifactInfo=artifactInfo.getServiceCalledByRequestEvent()/>
+            </div>
+        </#if>
+
+        <div>
+        <h2>Forms Referring to This Request</h2>
+        <#list artifactInfo.getFormInfosReferringToRequest()! as formWidgetArtifactInfo>
+            <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
+        </#list>
+        </div>
+        <div>
+        <h2>Forms Targeting This Request</h2>
+        <#list artifactInfo.getFormInfosTargetingRequest()! as formWidgetArtifactInfo>
+            <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Screens Referring to This Request</h2>
+        <#list artifactInfo.getScreenInfosReferringToRequest()! as screenWidgetArtifactInfo>
+            <@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Requests That Are Responses to This Request</h2>
+        <#list artifactInfo.getRequestsThatAreResponsesToThisRequest()! as controllerRequestArtifactInfo>
+            <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
+        </#list>
+        </div>
+        
+        <div>
+        <h2>Requests That This Request is a Responses To</h2>
+        <#list artifactInfo.getRequestsThatThisRequestIsResponsTo()! as controllerRequestArtifactInfo>
+            <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
+        </#list>
+        </div>
+
+        <div>
+        <h2>Controller Views That Are Responses to This Request</h2>
+        <#list artifactInfo.getViewsThatAreResponsesToThisRequest()! as controllerViewArtifactInfo>
+            <@displayControllerViewArtifactInfo controllerViewArtifactInfo=controllerViewArtifactInfo/>
+        </#list>
+        </div>
+
+    <#elseif artifactInfo.getType() == "view"/>
+        <div>
+        <h2>Requests That This View is a Responses To</h2>
+        <#list artifactInfo.getRequestsThatThisViewIsResponseTo()! as controllerRequestArtifactInfo>
+            <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
+        </#list>
+        </div>
+
+        <#if artifactInfo.getScreenCalledByThisView()??>
+            <div>
+            <h2>Screen Called by This View</h2>
+            <@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=artifactInfo.getScreenCalledByThisView()/>
+            </div>
+        </#if>
+
+    </#if>
+</#if>
+
+<#-- ==================== MACROS ===================== -->
+<#macro displayEntityArtifactInfo entityArtifactInfo>
+    <div>&nbsp;-&nbsp;<@displayArtifactInfo artifactInfo=entityArtifactInfo/></div>
+</#macro>
+
+<#macro displayServiceArtifactInfo serviceArtifactInfo>
+    <div>&nbsp;-&nbsp;<@displayArtifactInfo artifactInfo=serviceArtifactInfo/></div>
+</#macro>
+
+<#macro displayServiceEcaArtifactInfo serviceEcaArtifactInfo>
+    <h4>Service ECA Rule: ${serviceEcaArtifactInfo.getDisplayPrefixedName()}</h4>
+    <#if serviceEcaArtifactInfo.serviceEcaRule.getEcaConditionList()?has_content>
+        <h4>ECA Rule Conditions</h4>
+        <#list serviceEcaArtifactInfo.serviceEcaRule.getEcaConditionList() as ecaCondition>
+            <div>&nbsp;-&nbsp;${ecaCondition.getShortDisplayDescription(true)}</div>
+        </#list>
+    </#if>
+    <#if serviceEcaArtifactInfo.serviceEcaRule.getEcaActionList()?has_content>
+        <h4>ECA Rule Actions</h4>
+        <table>
+        <#list serviceEcaArtifactInfo.serviceEcaRule.getEcaActionList() as ecaAction>
+            <tr>
+                <td><a href="<@ofbizUrl>ArtifactInfo?type=${artifactInfo.getType()}&amp;uniqueId=${ecaAction.getServiceName()}</@ofbizUrl>">${ecaAction.getServiceName()}</a></td>
+                <td>${ecaAction.getServiceMode()}<#if ecaAction.isPersist()>-persisted</#if></td>
+            </tr>
+        </#list>
+        </table>
+    </#if>
+
+    <#-- leaving this out, will show service links for actions
+    <#if serviceEcaArtifactInfo.getServicesCalledByServiceEcaActions()?has_content>
+        <h4>Services Called By Service ECA Actions</h4>
+        <#list serviceEcaArtifactInfo.getServicesCalledByServiceEcaActions() as serviceArtifactInfo>
+            <@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
+        </#list>
+    </#if>
+    -->
+    <#if serviceEcaArtifactInfo.getServicesTriggeringServiceEca()?has_content>
+        <h4>Services Triggering Service ECA</h4>
+        <#list serviceEcaArtifactInfo.getServicesTriggeringServiceEca() as serviceArtifactInfo>
+            <@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
+        </#list>
+    </#if>
+</#macro>
+
+<#macro displayFormWidgetArtifactInfo formWidgetArtifactInfo>
+    <div>&nbsp;-&nbsp;<@displayArtifactInfo artifactInfo=formWidgetArtifactInfo/></div>
+</#macro>
+
+<#macro displayScreenWidgetArtifactInfo screenWidgetArtifactInfo>
+    <div>&nbsp;-&nbsp;<@displayArtifactInfo artifactInfo=screenWidgetArtifactInfo/></div>
+</#macro>
+
+<#macro displayControllerRequestArtifactInfo controllerRequestArtifactInfo>
+    <div>&nbsp;-&nbsp;<@displayArtifactInfo artifactInfo=controllerRequestArtifactInfo/></div>
+</#macro>
+
+<#macro displayControllerViewArtifactInfo controllerViewArtifactInfo>
+    <div>&nbsp;-&nbsp;<@displayArtifactInfo artifactInfo=controllerViewArtifactInfo/></div>
+</#macro>
+
+<#macro displayArtifactInfo artifactInfo>
+    <@displayArtifactInfoLink type=artifactInfo.getType() uniqueId=artifactInfo.getUniqueId() displayName=artifactInfo.getDisplayName()/>
+</#macro>
+
+<#macro displayArtifactInfoLink type uniqueId displayName>
+<a href="<@ofbizUrl>ArtifactInfo?type=${type}&amp;uniqueId=${uniqueId?url('ISO-8859-1')}</@ofbizUrl>">${displayName}</a>
+</#macro>
Index: framework/webtools/template/cert/viewbrowsercerts.ftl
===================================================================
--- framework/webtools/template/cert/viewbrowsercerts.ftl	(revision 0)
+++ framework/webtools/template/cert/viewbrowsercerts.ftl	(revision 0)
@@ -0,0 +1,66 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#assign isSecure = request.isSecure()/>
+<#assign clientCerts = request.getAttribute("javax.servlet.request.X509Certificate")!/>
+<#if (!clientCerts?has_content)>
+    <#assign clientCerts = request.getAttribute("javax.net.ssl.peer_certificates")!/>
+</#if>
+
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <h3>${uiLabelMap.WebtoolsCertsX509}</h3>
+  </div>
+  <#if (isSecure)>
+    <#if (clientCerts?has_content)>
+      <table class="basic-table">
+        <#list clientCerts as cert>
+          <#assign certString = Static["org.ofbiz.base.util.KeyStoreUtil"].certToString(cert)!>
+          <#if (certString?has_content)>
+            <tr>
+              <td class="label">${uiLabelMap.WebtoolsCertsCert}</td>
+              <td>${cert.getType()} ${cert.getSubjectX500Principal()}</td>
+            </tr>
+            <tr>
+              <td class="label">${uiLabelMap.WebtoolsCertsSerialNum}:</td>
+              <td>${cert.getSerialNumber().toString(16)}</td>
+            </tr>
+            <tr>
+              <td>&nbsp;</td>
+              <td>
+                <textarea rows="4" cols="130">
+${certString}
+
+-----BEGIN PUBLIC KEY HEX-----
+${Static["org.ofbiz.base.util.KeyStoreUtil"].pemToPkHex(certString)}
+-----END PUBLIC KEY HEX-----
+
+                </textarea>
+              </td>
+            </tr>
+          </#if>
+        </#list>
+      </table>
+    <#else>
+      <div class="screenlet-body">${uiLabelMap.WebtoolsCertsNotFound}.</div>
+    </#if>
+  <#else>
+    <div class="screenlet-body">${uiLabelMap.WebtoolsCertsRequiresSSL}.</div>
+  </#if>
+</div>
\ No newline at end of file
Index: framework/webtools/template/datafile/viewdatafile.ftl
===================================================================
--- framework/webtools/template/datafile/viewdatafile.ftl	(revision 0)
+++ framework/webtools/template/datafile/viewdatafile.ftl	(revision 0)
@@ -0,0 +1,152 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+    <p>${uiLabelMap.WebtoolsDataFileMessage1}.</p>
+    <br />
+    <#if security.hasPermission("DATAFILE_MAINT", session)>
+      <form method="post" action="<@ofbizUrl>viewdatafile</@ofbizUrl>">
+        <table class="basic-table" cellspacing="0">
+          <tr>
+            <td class="label">${uiLabelMap.WebtoolsDataDefinitionFileName}</td>
+            <td><input name="DEFINITION_LOCATION" type="text" size="60" value="${parameters.DEFINITION_LOCATION!}" /></td>
+            <td><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" name="DEFINITION_IS_URL"<#if parameters.DEFINITION_IS_URL?has_content> checked="checked"</#if> /></td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.WebtoolsDataDefinitionName}</td>
+            <td>
+              <#if definitionNames?has_content>
+                <select name="DEFINITION_NAME">
+                  <option value=""></option>
+                  <#list definitionNames as oneDefinitionName>
+                    boolean isSelected = definitionName?? && definitionName.equals(oneDefinitionName);
+                    <option value="${oneDefinitionName}" <#if parameters.DEFINITION_NAME?? && parameters.DEFINITION_NAME == oneDefinitionName> selected="selected" </#if>>${oneDefinitionName}</option>
+                  </#list>
+                </select>
+              <#else>
+                <input name="DEFINITION_NAME" type="text" size="30" value="${definitionName!}" />
+              </#if>
+            </td>
+            <td>&nbsp;</td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.WebtoolsDataFileName}</td>
+            <td><input name="DATAFILE_LOCATION" type="text" size="60" value="${parameters.DATAFILE_LOCATION!}" /></td>
+            <td><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" name="DATAFILE_IS_URL"<#if parameters.DATAFILE_IS_URL?has_content> checked="checked"</#if> /></td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.WebtoolsDataSaveToFile}</td>
+            <td><input name="DATAFILE_SAVE" type="text" size="60" value="${parameters.DATAFILE_SAVE!}"/></td>
+            <td>&nbsp;</td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.WebtoolsDataSaveToXml}</td>
+            <td><input name="ENTITYXML_FILE_SAVE" type="text" size="60" value="${parameters.ENTITYXML_FILE_SAVE!}" /></td>
+            <td>&nbsp;</td>
+          </tr>
+          <tr>
+            <td>&nbsp;</td>
+            <td><input type="submit" value="${uiLabelMap.CommonRun}" /></td>
+            <td>&nbsp;</td>
+          </tr>
+        </table>
+      </form>
+
+      <#if messages?has_content>
+        <hr />
+        <h1>${uiLabelMap.CommonFollowingOccurred}:</h1>
+        <div>
+          <#list messages as message>
+            <p>${message}</p>
+          </#list>
+        </div>
+      </#if>
+
+    <#macro displayrecords records>
+        <#assign lastRecordName = null>
+        <#list records as record>
+          <#assign modelRecord = record.getModelRecord()>
+          <#-- if record is different than the last displayed, make a new table and header row -->
+          <#if !modelRecord.name.equals(lastRecordName)>
+            <#if lastRecordName??>
+              </table><br />
+            </#if>
+            <table class="basic-table hover-bar" cellspacing="0">
+              <tr>
+                <td><b>Record: ${modelRecord.name}</b></td>
+                <#if (modelRecord.parentName)?has_content>
+                  <td><b>Parent: ${modelRecord.parentName}</b></td>
+                </#if>
+                 <td>${modelRecord.description}</td>
+               </tr>
+            </table>
+            <table class="dark-grid" cellspacing='0'>
+              <tr>
+                <#list modelRecord.fields as modelField>
+                  <td><b>${modelField.name}</b></td>
+                </#list>
+              </tr>
+            <#assign lastRecordName = modelRecord.name>
+          </#if>
+
+          <tr>
+            <#list modelRecord.fields as modelField>
+              <#assign value = record.get(modelField.name)>
+              <#if value?has_content>
+                <td>${value}</td>
+              <#else>
+                <td>${modelField.defaultValue}</td>
+              </#if>
+            </#list>
+          </tr>
+          <#if (record.getChildRecords())?has_content>
+            <@displayrecords records = record.getChildRecords()/>
+          </#if>
+        </#list>
+        </table>
+    </#macro>
+
+      <#if dataFile?has_content && modelDataFile?has_content && (!parameters.ENTITYXML_FILE_SAVE?has_content || parameters.ENTITYXML_FILE_SAVE.length() == 0) && (parameters.DATAFILE_SAVE == null || parameters.DATAFILE_SAVE.length() == 0)>
+        <hr />
+        <table class="basic-table" cellspacing="0">
+          <tr class="header-row">
+            <td>Name</td>
+            <td>Type-Code</td>
+            <td>Sender</td>
+            <td>Receiver</td>
+            <td>Record Length</td>
+            <td>Separator Style</td>
+          </tr>
+          <tr>
+            <td>${modelDataFile.name}</td>
+            <td>${modelDataFile.typeCode}</td>
+            <td>${modelDataFile.sender}</td>
+            <td>${modelDataFile.receiver}</td>
+            <td>${modelDataFile.recordLength}</td>
+            <td>${modelDataFile.separatorStyle}</td>
+          </tr>
+          <tr>
+            <td class="label">Description</td>
+            <td colspan="">${modelDataFile.description}</td>
+          </tr>
+        </table>
+        <br />
+        <@displayrecords records = dataFile.getRecords()/>
+      </#if>
+    <#else>
+      <h3>You do not have permission to use this page (DATAFILE_MAINT needed)</h3>
+    </#if>
Index: framework/webtools/template/entity/CheckDb.ftl
===================================================================
--- framework/webtools/template/entity/CheckDb.ftl	(revision 0)
+++ framework/webtools/template/entity/CheckDb.ftl	(revision 0)
@@ -0,0 +1,120 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+    <h3>${uiLabelMap.WebtoolsCheckUpdateDatabase}</h3>
+    <form method="post" action="${encodeURLCheckDb}">
+        <input type="hidden" name="option" value="checkupdatetables"/>
+        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
+        &nbsp;<input type="checkbox" name="checkPks" value="true" checked="checked"/>&nbsp;${uiLabelMap.WebtoolsPks}
+        &nbsp;<input type="checkbox" name="checkFks" value="true"/>&nbsp;${uiLabelMap.WebtoolsFks}
+        &nbsp;<input type="checkbox" name="checkFkIdx" value="true"/>&nbsp;${uiLabelMap.WebtoolsFkIdx}
+        &nbsp;<input type="checkbox" name="addMissing" value="true"/>&nbsp;${uiLabelMap.WebtoolsAddMissing}
+        &nbsp;<input type="checkbox" name="repair" value="true"/>&nbsp;${uiLabelMap.WebtoolsRepairColumnSizes}
+        <input type="submit" value="${uiLabelMap.WebtoolsCheckUpdateDatabase}"/>
+    </form>
+    <p>${uiLabelMap.WebtoolsNoteUseAtYourOwnRisk}</p>
+    <script language="JavaScript" type="text/javascript">
+         function enableTablesRemove() {
+             document.forms["TablesRemoveForm"].elements["TablesRemoveButton"].disabled=false;
+         }
+    </script>
+    <h3>${uiLabelMap.WebtoolsRemoveAllTables}</h3>
+    <form method="post" action="${encodeURLCheckDb}" name="TablesRemoveForm">
+        <input type="hidden" name="option" value="removetables"/>
+        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
+        <input type="submit" value="${uiLabelMap.CommonRemove}" name="TablesRemoveButton" disabled="disabled"/>
+        <input type="button" value="${uiLabelMap.WebtoolsEnable}" onclick="enableTablesRemove();"/>
+    </form>
+    <form method="post" action="${encodeURLCheckDb}" name="TableRemoveForm">
+        <input type="hidden" name="option" value="removetable"/>
+        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="20"/>
+        ${uiLabelMap.WebtoolsEntityName}: <input type="text" name="entityName" value="${entityName}" size="20"/>
+        <input type="submit" value="${uiLabelMap.CommonRemove}" name="TablesRemoveButton"/>
+    </form>
+    <h3>${uiLabelMap.WebtoolsCreateRemoveAllPrimaryKeys}</h3>
+    <form method="post" action="${encodeURLCheckDb}">
+        <input type="hidden" name="option" value="createpks"/>
+        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
+        <input type="submit" value="${uiLabelMap.CommonCreate}"/>
+    </form>
+    <form method="post" action="${encodeURLCheckDb}">
+        <input type="hidden" name="option" value="removepks"/>
+        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
+        <input type="submit" value="${uiLabelMap.CommonRemove}"/>
+    </form>
+    <h3>${uiLabelMap.WebtoolsCreateRemovePrimaryKey}</h3>
+    <form method="post" action="${encodeURLCheckDb}">
+        <input type="hidden" name="option" value="createpk"/>
+        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="20"/>
+        ${uiLabelMap.WebtoolsEntityName}: <input type="text" name="entityName" value="${entityName}" size="20"/>
+        <input type="submit" value="${uiLabelMap.CommonCreate}"/>
+    </form>
+    <form method="post" action="${encodeURLCheckDb}">
+        <input type="hidden" name="option" value="removepk"/>
+        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="20"/>
+        ${uiLabelMap.WebtoolsEntityName}: <input type="text" name="entityName" value="${entityName}" size="20"/>
+        <input type="submit" value="${uiLabelMap.CommonRemove}"/>
+    </form>
+    <h3>${uiLabelMap.WebtoolsCreateRemoveAllDeclaredIndices}</h3>
+    <form method="post" action="${encodeURLCheckDb}">
+        <input type="hidden" name="option" value="createidx"/>
+        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
+        <input type="submit" value="${uiLabelMap.CommonCreate}"/>
+    </form>
+    <form method="post" action="${encodeURLCheckDb}">
+        <input type="hidden" name="option" value="removeidx"/>
+        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
+        <input type="submit" value="${uiLabelMap.CommonRemove}"/>
+    </form>
+    <h3>${uiLabelMap.WebtoolsCreateRemoveAllForeignKeyIndices}</h3>
+    <form method="post" action="${encodeURLCheckDb}">
+        <input type="hidden" name="option" value="createfkidxs"/>
+        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
+        <input type="submit" value="${uiLabelMap.CommonCreate}"/>
+    </form>
+    <form method="post" action="${encodeURLCheckDb}">
+        <input type="hidden" name="option" value="removefkidxs"/>
+        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
+        <input type="submit" value="${uiLabelMap.CommonRemove}"/>
+    </form>
+    <h3>${uiLabelMap.WebtoolsCreateRemoveAllForeignKeys}</h3>
+    <p>${uiLabelMap.WebtoolsNoteForeighKeysMayAlsoBeCreated}</p>
+    <form method="post" action="${encodeURLCheckDb}">
+        <input type="hidden" name="option" value="createfks"/>
+        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
+        <input type="submit" value="${uiLabelMap.CommonCreate}"/>
+    </form>
+    <form method="post" action="${encodeURLCheckDb}">
+        <input type="hidden" name="option" value="removefks"/>
+        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
+        <input type="submit" value="${uiLabelMap.CommonRemove}"/>
+    </form>
+    <h3>${uiLabelMap.WebtoolsUpdateCharacterSetAndCollate}</h3>
+    <form method="post" action="${encodeURLCheckDb}">
+        <input type="hidden" name="option" value="updateCharsetCollate"/>
+        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
+        <input type="submit" value="${uiLabelMap.CommonUpdate}"/>
+    </form>
+<#if miters?has_content>
+    <hr />
+    <ul>
+        <#list miters as miter>
+            <li>${miter}</li>
+        </#list>
+    </ul>
+</#if>
Index: framework/webtools/template/entity/ConnectionPoolStatus.ftl
===================================================================
--- framework/webtools/template/entity/ConnectionPoolStatus.ftl	(revision 0)
+++ framework/webtools/template/entity/ConnectionPoolStatus.ftl	(revision 0)
@@ -0,0 +1,56 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<h1>Connection Pool Status</h1>
+
+<#assign groups = delegator.getModelGroupReader().getGroupNames(delegator.getDelegatorName())!/>
+<table class="basic-table light-grid hover-bar">
+    <tr class="header-row">
+        <td>Helper Name</td>
+        <td>Num Active</td>
+        <td>Num Idle</td>
+        <td>Num Total</td>
+        <td>Max Active</td>
+        <td>Max Idle</td>
+        <td>Min Idle</td>
+        <td>Min Evictable Idle Time</td>
+        <td>Max Wait</td>
+    </tr>
+    <#assign alt_row = false>
+    <#if (groups?has_content)>
+        <#list groups as group>
+            <#assign helper = delegator.getGroupHelperName(group)!/>
+            <#if (helper?has_content)>
+                <#assign dataSourceInfo = Static["org.ofbiz.entity.connection.DBCPConnectionFactory"].getDataSourceInfo(helper)!/>
+                <#if (dataSourceInfo?has_content)>
+                    <tr>
+                        <td>${helper}</td>
+                        <td>${dataSourceInfo.poolNumActive!}</td>
+                        <td>${dataSourceInfo.poolNumIdle!}</td>
+                        <td>${dataSourceInfo.poolNumTotal!}</td>
+                        <td>${dataSourceInfo.poolMaxActive!}</td>
+                        <td>${dataSourceInfo.poolMaxIdle!}</td>
+                        <td>${dataSourceInfo.poolMinIdle!}</td>
+                        <td>${dataSourceInfo.poolMinEvictableIdleTimeMillis!}</td>
+                        <td>${dataSourceInfo.poolMaxWait!}</td>
+                    </tr>
+                </#if>
+            </#if>
+        </#list>
+    </#if>
+</table>
Index: framework/webtools/template/entity/EntityExportAll.ftl
===================================================================
--- framework/webtools/template/entity/EntityExportAll.ftl	(revision 0)
+++ framework/webtools/template/entity/EntityExportAll.ftl	(revision 0)
@@ -0,0 +1,36 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div class="page-title"><span>${uiLabelMap.WebtoolsExportFromDataSource}</span></div>
+<p>${uiLabelMap.WebtoolsXMLExportInfo}</p>
+<#if results?has_content>
+    <hr />
+    <h2>${uiLabelMap.WebtoolsResults}:</h2>
+    <#list results as result>
+        <p>${result}</p>
+    </#list>
+</#if>
+<hr />
+<form method="post" action="<@ofbizUrl>entityExportAll</@ofbizUrl>">
+    ${uiLabelMap.WebtoolsOutputDirectory}: <input type="text" size="60" name="outpath" value="${outpath!}" /><br />
+    ${uiLabelMap.CommonFromDate}: <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/><br/>
+    ${uiLabelMap.WebtoolsTimeoutSeconds}: <input type="text" size="6" value="${txTimeout?default('7200')}" name="txTimeout"/><br />
+    <br />
+    <input type="submit" value="${uiLabelMap.WebtoolsExport}" />
+</form>
Index: framework/webtools/template/entity/EntityImport.ftl
===================================================================
--- framework/webtools/template/entity/EntityImport.ftl	(revision 0)
+++ framework/webtools/template/entity/EntityImport.ftl	(revision 0)
@@ -0,0 +1,48 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div>
+<p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
+<hr />
+
+  <form method="post" action="<@ofbizUrl>entityImport</@ofbizUrl>">
+    ${uiLabelMap.WebtoolsAbsoluteFileNameOrUrl}:<br />
+    <input type="text" size="60" name="filename" value="${filename!}"/><br />
+    ${uiLabelMap.WebtoolsAbsoluteFTLFilename}:<br />
+    <input type="text" size="40" name="fmfilename" value="${fmfilename!}"/><br />
+    <input type="checkbox" name="isUrl" <#if isUrl??>checked="checked"</#if>/>${uiLabelMap.WebtoolsIsURL}<br />
+    <input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br />
+    <input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
+    <input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
+    <input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
+    ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
+    <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div>
+  </form>
+  <form method="post" action="<@ofbizUrl>entityImport</@ofbizUrl>">
+    ${uiLabelMap.WebtoolsCompleteXMLDocument}:<br />
+    <textarea rows="20" cols="85" name="fulltext">${fulltext?default("<entity-engine-xml>\n</entity-engine-xml>")}</textarea>
+    <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportText}"/></div>
+  </form>
+  <#if messages??>
+      <hr />
+      <h3>${uiLabelMap.WebtoolsResults}:</h3>
+      <#list messages as message>
+          <p>${message}</p>
+      </#list>
+  </#if>
Index: framework/webtools/template/entity/EntityImportDir.ftl
===================================================================
--- framework/webtools/template/entity/EntityImportDir.ftl	(revision 0)
+++ framework/webtools/template/entity/EntityImportDir.ftl	(revision 0)
@@ -0,0 +1,42 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div>
+<p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
+<hr />
+
+  <form method="post" action="<@ofbizUrl>entityImportDir</@ofbizUrl>">
+    ${uiLabelMap.WebtoolsAbsolutePath}:<br />
+    <input type="text" size="60" name="path" value="${path!}"/><br />
+    <input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br />
+    <input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
+    <input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
+    <input type="checkbox" name="deleteFiles" <#if (deleteFiles??)>checked="checked"</#if>/>${uiLabelMap.WebtoolsDeleteFiles}<br />
+    <input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
+    ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
+    ${uiLabelMap.WebtoolsPause}:<input type="text" size="6" value="${filePauseStr?default("0")}" name="filePause"/><br />
+    <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div>
+  </form>
+  <#if messages??>
+    <hr />
+    <h1>${uiLabelMap.WebtoolsResults}:</h1>
+    <#list messages as message>
+        <p>${message}</p>
+    </#list>
+  </#if>
Index: framework/webtools/template/entity/EntityImportReaders.ftl
===================================================================
--- framework/webtools/template/entity/EntityImportReaders.ftl	(revision 0)
+++ framework/webtools/template/entity/EntityImportReaders.ftl	(revision 0)
@@ -0,0 +1,39 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div>
+<p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
+<hr />
+  <form method="post" action="<@ofbizUrl>entityImportReaders</@ofbizUrl>">
+    Enter Readers (comma separated, no spaces; from entityengine.xml and ofbiz-component.xml files; common ones include seed,ext,demo):<br />
+    <input type="text" size="60" name="readers" value="${readers?default("seed")}"/><br />
+    <input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMostlyInserts}<br />
+    <input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
+    <input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
+    <input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
+    ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
+    <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImport}"/></div>
+  </form>
+  <#if messages??>
+      <hr />
+      <h3>${uiLabelMap.WebtoolsResults}:</h3>
+      <#list messages as message>
+          <p>${message}</p>
+      </#list>
+  </#if>
Index: framework/webtools/template/entity/EntityMaint.ftl
===================================================================
--- framework/webtools/template/entity/EntityMaint.ftl	(revision 0)
+++ framework/webtools/template/entity/EntityMaint.ftl	(revision 0)
@@ -0,0 +1,110 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+    <div>
+       <form action="<@ofbizUrl>/entitymaint</@ofbizUrl>">
+          <b>${uiLabelMap.CommonGroup}:</b>
+          <select name="filterByGroupName">
+             <option value="">${uiLabelMap.CommonAll}</option>
+             <#list entityGroups as group>
+                <option value="${group}" <#if filterByGroupName??><#if group = filterByGroupName>selected="selected"</#if></#if>>${group}</option>
+             </#list>
+          </select>
+          <b>${uiLabelMap.WebtoolsEntityName}:</b>
+          <input type= "text" name= "filterByEntityName" value="${parameters.filterByEntityName!}"/>
+          <input type="submit" value="${uiLabelMap.CommonApply}"/>
+       </form>
+    </div>
+    <#assign firstChar = "x">
+    <#assign anchor="">
+    <#assign alt_row = false>
+    <#assign right_col = false>
+    <div class="button-bar">
+      <#list entitiesList as entity>
+        <#if entity.entityName?substring(0, 1) != firstChar>
+          <#assign firstChar = entity.entityName?substring(0, 1)>
+          <a href="#Entity_${firstChar}">${firstChar}</a>&nbsp;
+        </#if>
+      </#list>
+    </div>
+    <div class="screenlet">
+      <div class="screenlet-title-bar">
+        <ul>
+          <li class="h3">${uiLabelMap.WebtoolsEntitiesAlpha}</li>
+        </ul>
+        <br class="clear"/>
+      </div>
+      <div class="screenlet-body">
+        <#assign firstChar = "*">
+        <table class="basic-table hover-bar" cellspacing='0'>
+          <tr class="header-row">
+            <td>${uiLabelMap.WebtoolsEntityName}</td>
+            <td>&nbsp;</td>
+            <td>${uiLabelMap.WebtoolsEntityName}</td>
+            <td>&nbsp;</td>
+          </tr>
+          <#list entitiesList as entity>
+            <#if entity.entityName?substring(0, 1) != firstChar>
+              <#if right_col>
+                <td>&nbsp;</td><td>&nbsp;</td></tr>
+                <#assign right_col = false>
+                <#assign alt_row = !alt_row>
+              </#if>
+              <#if firstChar != "*">
+                <tr<#if alt_row> class="alternate-row"</#if>><td colspan="4">&nbsp;</td></tr>
+                <#assign alt_row = !alt_row>
+              </#if>
+              <#assign firstChar = entity.entityName?substring(0, 1)>
+              <#assign anchor="id=\"Entity_${firstChar}\"">
+            </#if>
+            <#if !right_col>
+              <tr<#if alt_row> class="alternate-row"</#if>>
+            </#if>
+
+            <td<#if anchor?has_content> ${anchor}</#if>>${entity.entityName}<#if entity.viewEntity == 'Y'>&nbsp;(${uiLabelMap.WebtoolsEntityView})</#if></td>
+            <#assign anchor="">
+            <td class="button-col">
+              <#if entity.viewEntity == 'Y'>
+                <#if entity.entityPermissionView == 'Y'>
+                  <a href='<@ofbizUrl>ViewRelations?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsReln}</a>
+                  <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsFind}</a>
+                  <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&amp;find=true&amp;VIEW_SIZE=50&amp;VIEW_INDEX=0</@ofbizUrl>'>${uiLabelMap.WebtoolsAll}</a>
+                </#if>
+              <#else>
+                <#if entity.entityPermissionCreate == 'Y'>
+                  <a href='<@ofbizUrl>ViewGeneric?entityName=${entity.entityName}</@ofbizUrl>' title='${uiLabelMap.CommonCreateNew}'>${uiLabelMap.WebtoolsCreate}</a>
+                </#if>
+                <#if entity.entityPermissionView == 'Y'>
+                  <a href='<@ofbizUrl>ViewRelations?entityName=${entity.entityName}</@ofbizUrl>' title='${uiLabelMap.WebtoolsViewRelations}'>${uiLabelMap.WebtoolsReln}</a>
+                  <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}</@ofbizUrl>' title='${uiLabelMap.WebtoolsFindRecord}'>${uiLabelMap.WebtoolsFind}</a>
+                  <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&amp;find=true&amp;VIEW_SIZE=50&amp;VIEW_INDEX=0</@ofbizUrl>' title='${uiLabelMap.WebtoolsFindAllRecords}'>${uiLabelMap.WebtoolsAll}</a>
+                </#if>
+              </#if>
+            </td>
+            <#if right_col>
+              </tr>
+              <#assign alt_row = !alt_row>
+            </#if>
+            <#assign right_col = !right_col>
+          </#list>
+          <#if right_col>
+            <td>&nbsp;</td><td>&nbsp;</td></tr>
+          </#if>
+        </table>
+      </div>
+    </div>
Index: framework/webtools/template/entity/EntityRef.ftl
===================================================================
--- framework/webtools/template/entity/EntityRef.ftl	(revision 0)
+++ framework/webtools/template/entity/EntityRef.ftl	(revision 0)
@@ -0,0 +1,32 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html>
+    <head>
+        <title>${uiLabelMap.WebtoolsEntityReferenceChart}</title>
+    </head>
+    <frameset cols="30%,70%">
+        <frame src="${encodeUrlList}" name="entityListFrame"/>
+        <frame src="${encodeUrlMain}" name="entityFrame"/>
+    </frameset>
+    <noframes>
+        <h2>${uiLabelMap.CommonFrameAlert1}</h2>
+        <p>${uiLabelMap.CommonFrameAlert2}</p>
+        <br />
+    </noframes>
+</html>
Index: framework/webtools/template/entity/EntityRefList.ftl
===================================================================
--- framework/webtools/template/entity/EntityRefList.ftl	(revision 0)
+++ framework/webtools/template/entity/EntityRefList.ftl	(revision 0)
@@ -0,0 +1,77 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#assign docLangAttr = locale.toString()?replace("_", "-")>
+<#assign langDir = "ltr">
+<#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
+    <#assign langDir = "rtl">
+</#if>
+<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>${uiLabelMap.WebtoolsEntityReference}</title>
+        <style type="text/css">
+           body, textarea, input, select {font-family: Helvetica, sans-serif; background-color: #ffffff; text-decoration: none;}
+          .section-header {font-size: 10pt; font-weight: bold; color: #000000; padding-bottom: 10;}
+          .listtext {font-size: 10pt; font-weight: bold; color: blue;}
+          .listtext a {text-decoration: none;}
+          .listtext a:hover {color:red; text-decoration: underline;}
+        </style>
+    </head>
+    <body>
+        <div class='listtext'>
+            <#if !forstatic>
+                <a href="<@ofbizUrl>main</@ofbizUrl>" target='main'>${uiLabelMap.WebtoolsPopupWebToolsMain}</a><br/>
+                <a href="<@ofbizUrl>view/entityref_main</@ofbizUrl>" target="entityFrame">${uiLabelMap.WebtoolsEntityReferenceMainPage}</a><br/>
+                <a href="<@ofbizUrl>view/checkdb</@ofbizUrl>" target="entityFrame">${uiLabelMap.WebtoolsCheckUpdateDatabase}</a>
+                <hr />
+                <#-- want to leave these out because they are only working so-so, and cause people more problems that they solve, IMHO
+                <a href="<@ofbizUrl>ModelWriter</@ofbizUrl>" target='_blank'>Generate Entity Model XML (all in one)</a><br/>
+                <a href="<@ofbizUrl>ModelWriter?savetofile=true</@ofbizUrl>" target='_blank'>Save Entity Model XML to Files</a><br/>
+                -->
+                <#-- this is not working now anyway...
+                <a href="<@ofbizUrl>ModelGroupWriter</@ofbizUrl>" target='_blank'>Generate Entity Group XML</a><br/>
+                <a href="<@ofbizUrl>ModelGroupWriter?savetofile=true</@ofbizUrl>" target='_blank'>Save Entity Group XML to File</a><br/>
+                -->
+                <a href="<@ofbizUrl>view/ModelInduceFromDb</@ofbizUrl>" target='_blank'>${uiLabelMap.WebtoolsInduceModelXMLFromDatabase}</a><br/>
+            </#if>
+            <#if packageNames?has_content>
+                <hr />
+                <div class="section-header">${uiLabelMap.WebtoolsEntityPackages}</div>
+                <#list packageNames as packageName>
+                    <#if forstatic>
+                        <a href="<@ofbizUrl>view/entityref_main?forstatic=true#${packageName}</@ofbizUrl>" target="entityFrame">${packageName}</a><br />
+                    <#else>
+                        <a href="<@ofbizUrl>view/entityref_main#${packageName}</@ofbizUrl>" target="entityFrame">${packageName}</a><br />
+                    </#if>
+                </#list>
+            </#if>
+            <#if entitiesList?has_content>
+                <hr />
+                <div class="section-header">${uiLabelMap.WebtoolsEntitiesAlpha}</div>
+                <#list entitiesList as entity>
+                    <#if forstatic>
+                        <a href="<@ofbizUrl>view/entityref_main?forstatic=true#${entity.entityName}</@ofbizUrl>" target="entityFrame">${entity.entityName}</a>
+                    <#else>
+                        <a href="<@ofbizUrl>view/entityref_main#${entity.entityName}${entity.url!}</@ofbizUrl>" target="entityFrame">${entity.entityName}</a>
+                    </#if>
+                    <br />
+                </#list>
+            </#if>
+        </div>
+    </body>
+</html>
Index: framework/webtools/template/entity/EntityRefMain.ftl
===================================================================
--- framework/webtools/template/entity/EntityRefMain.ftl	(revision 0)
+++ framework/webtools/template/entity/EntityRefMain.ftl	(revision 0)
@@ -0,0 +1,178 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#assign docLangAttr = locale.toString()?replace("_", "-")>
+<#assign langDir = "ltr">
+<#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
+    <#assign langDir = "rtl">
+</#if>
+<#assign forstatic = false/>
+<#if (parameters.forstatic)?default("false") == "true">
+  <#assign forstatic = true/>
+</#if>
+<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>${uiLabelMap.WebtoolsEntityReference}</title>
+        <style type="text/css">
+           body, textarea, input, select {font-family: Helvetica, sans-serif; background-color: #ffffff;}
+          .packagetext {font-size: 18pt; font-weight: bold; text-align: center}
+          .toptext {font-size: 16pt; font-weight: bold; text-align: center}
+          .titletext {font-size: 12pt; font-weight: bold; color: blue;}
+          .headertext {font-size: 8pt; font-weight: bold; background-color: blue; color: white;}
+          .enametext {font-size: 8pt; font-weight: bold;}
+          .entityheader {font-size: 8pt; font-weight: bold; background-color: #cccccc; text-align: center}
+          .entityheader a {font-weight: normal;}
+          .entityheader a:hover {color:red;}
+          .entitytext {font-size: 8pt; background-color: #efffff;}
+          .relationtext {font-size: 8pt; background-color: #feeeee;}
+          .relationtext a {font-weight: bold; color: blue;}
+          .relationtext a:hover {color:red;}
+          .pktext {color:red;}
+          .descriptiontext {font-size: 8pt;}
+        </style>
+    </head>
+    <body>
+        <div class='toptext'>${uiLabelMap.WebtoolsEntityReferenceChart}<br />
+            ${numberOfEntities} ${uiLabelMap.WebtoolsTotalEntities}
+        </div>
+        <#assign numberShowed = 0>
+        <#list packagesList as package>
+            <hr /><div id='${package.packageName}' class='packagetext'>${package.packageName}</div><hr />
+            <#list package.entitiesList as entity>
+                <table width="95%" border="1" cellpadding='2' cellspacing='0'>
+                    <tr class='entityheader'>
+                        <td colspan="5">
+                            <div id='${entity.entityName}' class="titletext">
+                                ${uiLabelMap.WebtoolsEntity}: ${entity.entityName}
+                                <#if entity.plainTableName?has_content>  | ${uiLabelMap.WebtoolsTable}: ${entity.plainTableName}</#if>
+                            </div>
+                            <div>${entity.title}&nbsp;
+                                <#if !forstatic>
+                                    <a target='main' href="<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&amp;find=true&amp;VIEW_SIZE=50&amp;VIEW_INDEX=0</@ofbizUrl>">[${uiLabelMap.WebtoolsViewData}]</a>
+                                </#if>
+                                <#if !forstatic>
+                                    <a target='main' href="<@ofbizUrl>ArtifactInfo?name=${entity.entityName}&amp;type=entity</@ofbizUrl>">[${uiLabelMap.WebtoolsArtifactInfo}]</a>
+                                </#if>
+                            </div>
+                            <#if entity.description?has_content &&
+                                 !entity.description.equalsIgnoreCase("NONE") &&
+                                !entity.description.equalsIgnoreCase("")>
+                                   <div>${entity.description}</div>
+                            </#if>
+                            <#if entity.location?has_content>
+                                <div class='description'>${entity.location}</div>
+                            </#if>
+                        </td>
+                    </tr>
+                    <tr class='headertext'>
+                        <th width="30%">${uiLabelMap.WebtoolsJavaName}</th>
+                        <th width="30%">${uiLabelMap.WebtoolsDbName}</th>
+                        <th width="10%">${uiLabelMap.WebtoolsFieldType}</th>
+                        <th width="15%">${uiLabelMap.WebtoolsJavaType}</th>
+                        <th width="15%" nowrap="nowrap">${uiLabelMap.WebtoolsSqlType}</th>
+                    </tr>
+                    <#list entity.javaNameList as javaName>
+                        <tr class='entitytext'>
+                            <td>
+                              <div class='enametext<#if javaName.isPk> pktext</#if>'>${javaName.name}</div>
+                              <#if javaName.description?has_content>
+                                <div class="descriptiontext">${javaName.description}</div>
+                              </#if>
+                              <#if javaName.encrypted>
+                                <div class="descriptiontext">[${uiLabelMap.WebtoolsEncrypted}]</div>
+                              </#if>
+                            </td>
+                            <td>${javaName.colName}</td>
+                            <td>${javaName.type}</td>
+                            <#if javaName.javaType?has_content>
+                                <td>${javaName.javaType}</td>
+                                <td>${javaName.sqlType}</td>
+                            <#else>
+                                <td>${uiLabelMap.WebtoolsNotFound}</td>
+                                <td>${uiLabelMap.WebtoolsNotFound}</td>
+                            </#if>
+                        </tr>
+                    </#list>
+                    <#if entity.relationsList?has_content>
+                        <tr class='entityheader'>
+                            <td colspan="5"><hr /></td>
+                        </tr>
+                        <tr class='headertext'>
+                            <th>${uiLabelMap.WebtoolsRelation}</th>
+                            <th colspan='4'>${uiLabelMap.WebtoolsRelationType}</th>
+                        </tr>
+                        <#list entity.relationsList as relation>
+                            <tr class='relationtext'>
+                                <td>
+                                    <#if relation.title?has_content><b>${relation.title}</b> </#if><a href='#${relation.relEntity}'>${relation.relEntity}</a>
+                                    <#if relation.fkName?has_content>
+                                        <br />${uiLabelMap.WebtoolsFKName}: ${relation.fkName}
+                                    </#if>
+                                    <#if relation.description?has_content>
+                                        <br /><span class='descriptiontext'>${relation.description}</span>
+                                    </#if>
+                                </td>
+                                <td width="60%" colspan='4'>
+                                    ${relation.type}:
+                                    <#if relation.length == 3>
+                                        &nbsp;
+                                    </#if>
+                                    <#if relation.keysList?has_content>
+                                        <#list relation.keysList as keyList>
+                                            <br />&nbsp;&nbsp;${keyList.row})&nbsp;
+                                              <#if keyList.fieldName == keyList.relFieldName>
+                                                  ${keyList.fieldName}
+                                              <#else>
+                                                  ${keyList.fieldName} : ${keyList.relFieldName}
+                                              </#if>
+                                        </#list>
+                                    </#if>
+                                </td>
+                            </tr>
+                        </#list>
+                    </#if>
+                    <#if entity.indexList?has_content>
+                        <tr class='entityheader'>
+                            <td colspan="5"><hr /></td>
+                        </tr>
+                        <tr class='headertext'>
+                            <th>${uiLabelMap.WebtoolsIndexName}</th>
+                            <th colspan='4'>${uiLabelMap.WebtoolsIndexFieldList}</th>
+                        </tr>
+                        <#list entity.indexList as index>
+                            <tr class='relationtext'>
+                                <td>${index.name}</td>
+                                <td width="60%" colspan='4'>
+                                    <#list index.fieldNameList as fieldName>
+                                        ${fieldName}
+                                    </#list>
+                                </td>
+                            </tr>
+                        </#list>
+                    </#if>
+                </table>
+                <br />
+                <#assign numberShowed = numberShowed + 1>
+            </#list>
+        </#list>
+        <div align="center">
+            <br /><br />
+              ${uiLabelMap.WebtoolsEntityDisplayed}: ${numberShowed}
+        </div>
+    </body>
+</html>
Index: framework/webtools/template/entity/EntityRefReport.fo.ftl
===================================================================
--- framework/webtools/template/entity/EntityRefReport.fo.ftl	(revision 0)
+++ framework/webtools/template/entity/EntityRefReport.fo.ftl	(revision 0)
@@ -0,0 +1,208 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#escape x as x?xml>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-size="8pt">
+  <fo:layout-master-set>
+    <fo:simple-page-master master-name="letter-portrait" page-height="11in" page-width="8.5in"
+        margin-top="0.5in" margin-bottom="0.5in" margin-left="0.5in" margin-right="0.25in">
+      <fo:region-body margin-top="1.5in" margin-bottom="1in"/>
+      <fo:region-before precedence="true" extent="1.5in"/>
+      <fo:region-after precedence="true" extent="0.5in"/>
+      </fo:simple-page-master>
+  </fo:layout-master-set>
+
+  <#-- bookmark section -->
+  <fo:bookmark-tree>
+    <#list packagesList as package>
+      <#assign packageName = package.packageName/>
+      <fo:bookmark internal-destination="${packageName}">
+        <fo:bookmark-title>${packageName}</fo:bookmark-title>
+        <#list package.entitiesList as entity>
+          <fo:bookmark internal-destination="${entity.entityName}">
+            <fo:bookmark-title>${entity.entityName}</fo:bookmark-title>
+          </fo:bookmark>
+        </#list>
+      </fo:bookmark>
+    </#list>
+  </fo:bookmark-tree>
+
+  <#-- report section -->
+  <#list packagesList as package>
+    <#assign packageName = package.packageName/>
+    <#assign newPackage = true/>
+    <#list package.entitiesList as entity>
+
+      <fo:page-sequence master-reference="letter-portrait">
+        <#-- header -->
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block font-size="12pt" text-align="center">
+            ${uiLabelMap.WebtoolsEntityReference}
+          </fo:block>
+          <fo:block font-size="14pt" text-align="center" margin-bottom="14pt">
+            ${packageName}
+          </fo:block>
+          <fo:block font-size="14pt" text-align="center" margin-bottom="8pt">
+            ${entity.entityName}<#if entity.plainTableName?has_content> | ${uiLabelMap.WebtoolsTable}: ${entity.plainTableName}</#if>
+          </fo:block>
+          <#if entity.description?has_content && !entity.description.equalsIgnoreCase("NONE")>
+            <fo:block text-align="center" margin-bottom="8pt">${entity.description}</fo:block>
+          </#if>
+          <#if entity.location?has_content>
+            <fo:block text-align="center" margin-bottom="8pt">${entity.location}</fo:block>
+          </#if>
+        </fo:static-content>
+
+        <#-- footer -->
+        <fo:static-content flow-name="xsl-region-after">
+            <fo:block text-align="center" border-top="thin solid black">Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation</fo:block>
+            <fo:block text-align="center">${uiLabelMap.CommonPage} <fo:page-number/></fo:block>
+        </fo:static-content>
+
+        <#-- body -->
+        <fo:flow flow-name="xsl-region-body">
+          <#if newPackage>
+            <fo:block id="${packageName}"/>
+            <#assign newPackage = false/>
+          </#if>
+          <fo:block id="${entity.entityName}"/>
+          <#-- entity fields -->
+          <fo:table table-layout="fixed" width="100%" border-style="solid" border-collapse="collapse"
+                margin-bottom="14pt">
+              <fo:table-column column-width="27%"/>
+              <fo:table-column column-width="31%"/>
+              <fo:table-column column-width="9%"/>
+              <fo:table-column column-width="16%"/>
+              <fo:table-column column-width="17%"/>
+            <fo:table-header border-bottom-style="solid">
+              <fo:table-row font-weight="bold">
+                <fo:table-cell><fo:block>${uiLabelMap.WebtoolsJavaName}</fo:block></fo:table-cell>
+                <fo:table-cell><fo:block>${uiLabelMap.WebtoolsDbName}</fo:block></fo:table-cell>
+                <fo:table-cell><fo:block>${uiLabelMap.WebtoolsFieldType}</fo:block></fo:table-cell>
+                <fo:table-cell><fo:block>${uiLabelMap.WebtoolsJavaType}</fo:block></fo:table-cell>
+                <fo:table-cell><fo:block>${uiLabelMap.WebtoolsSqlType}</fo:block></fo:table-cell>
+              </fo:table-row>
+            </fo:table-header>
+            <fo:table-body>
+              <#list entity.javaNameList as javaName>
+                <fo:table-row>
+                  <fo:table-cell padding="2pt">
+                    <fo:block font-weight="bold">${javaName.name}<#if javaName.isPk> (pk)</#if></fo:block>
+                    <#if javaName.description?has_content>
+                      <fo:block>${javaName.description}</fo:block>
+                    </#if>
+                    <#if javaName.encrypted>
+                      <fo:block>[${uiLabelMap.WebtoolsEncrypted}]</fo:block>
+                    </#if>
+                  </fo:table-cell>
+                  <fo:table-cell padding="2pt">
+                    <fo:block>${javaName.colName}</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell padding="2pt">
+                    <fo:block>${javaName.type}</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell padding="2pt">
+                    <fo:block>${javaName.javaType?default(uiLabelMap.WebtoolsNotFound)}</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell padding="2pt">
+                    <fo:block>${javaName.sqlType?default(uiLabelMap.WebtoolsNotFound)}</fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </#list>
+            </fo:table-body>
+          </fo:table>
+          <#if entity.relationsList?has_content>
+            <#-- entity relations -->
+            <fo:table table-layout="fixed" width="100%" border-style="solid" border-collapse="collapse"
+                margin-bottom="14pt">
+              <fo:table-column column-width="proportional-column-width(1)"/>
+              <fo:table-column column-width="proportional-column-width(1)"/>
+              <fo:table-header border-bottom-style="solid">
+                <fo:table-row font-weight="bold">
+                  <fo:table-cell><fo:block>${uiLabelMap.WebtoolsRelation}</fo:block></fo:table-cell>
+                  <fo:table-cell><fo:block>${uiLabelMap.WebtoolsRelationType}</fo:block></fo:table-cell>
+                </fo:table-row>
+              </fo:table-header>
+              <fo:table-body>
+                <#list entity.relationsList as relation>
+                  <fo:table-row>
+                    <fo:table-cell padding="2pt">
+                      <fo:block font-weight="bold"><#if relation.title?has_content>${relation.title} </#if>${relation.relEntity}</fo:block>
+                      <#if relation.fkName?has_content>
+                        <fo:block>${uiLabelMap.WebtoolsFKName}: ${relation.fkName}</fo:block>
+                      </#if>
+                      <#if relation.description?has_content>
+                        <fo:block>${relation.description}</fo:block>
+                      </#if>
+                    </fo:table-cell>
+                    <fo:table-cell padding="2pt">
+                      <fo:block>
+                        ${relation.type}:
+                        <#if relation.keysList?has_content>
+                          <#list relation.keysList as keyList>
+                            ${keyList.row}
+                            <#if keyList.fieldName == keyList.relFieldName>
+                              ${keyList.fieldName}
+                            <#else>
+                              ${keyList.fieldName} : ${keyList.relFieldName}
+                            </#if>
+                          </#list>
+                        </#if>
+                      </fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                </#list>
+              </fo:table-body>
+            </fo:table>
+          </#if>
+          <#if entity.indexList?has_content>
+            <#-- entity indexes -->
+            <fo:table table-layout="fixed" width="100%" border-style="solid" border-collapse="collapse"
+                margin-bottom="14pt">
+              <fo:table-column column-width="proportional-column-width(1)"/>
+              <fo:table-column column-width="proportional-column-width(1)"/>
+              <fo:table-header border-bottom-style="solid">
+                <fo:table-row font-weight="bold">
+                  <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.WebtoolsIndexName}</fo:block></fo:table-cell>
+                  <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.WebtoolsIndexFieldList}</fo:block></fo:table-cell>
+                </fo:table-row>
+              </fo:table-header>
+              <fo:table-body>
+                <#list entity.indexList as index>
+                  <fo:table-row>
+                    <fo:table-cell padding="2pt">
+                      <fo:block font-weight="bold">${index.name}</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell padding="2pt">
+                      <fo:block>
+                        <#list index.fieldNameList as fieldName>
+                          ${fieldName}
+                        </#list>
+                      </fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                </#list>
+              </fo:table-body>
+            </fo:table>
+          </#if>
+        </fo:flow>
+      </fo:page-sequence>
+    </#list>
+  </#list>
+</fo:root>
+</#escape>
Index: framework/webtools/template/entity/EntitySQLProcessor.ftl
===================================================================
--- framework/webtools/template/entity/EntitySQLProcessor.ftl	(revision 0)
+++ framework/webtools/template/entity/EntitySQLProcessor.ftl	(revision 0)
@@ -0,0 +1,53 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <li class="h3">${uiLabelMap.WebtoolsResults}</li>
+    </ul>
+    <br class="clear"/>
+  </div>
+  <div class="screenlet-body">
+    <#if resultMessage?has_content>
+      ${resultMessage}
+      <br />
+    </#if>
+
+    <#if columns?has_content>
+        <table class="basic-table hover-bar" cellspacing="0">
+            <tr class="header-row">
+            <#list columns as column>
+                <td>${column}</td>
+            </#list>
+            </tr>
+            <#if records?has_content>
+            <#assign alt_row = false>
+            <#list records as record>
+                <tr <#if alt_row> class="alternate-row"</#if> >
+                <#list record as field>
+                    <td>${field!}</td>
+                </#list>
+                </tr>
+                <#assign alt_row = !alt_row>
+            </#list>
+            </#if>
+        </table>
+    </#if>
+  </div>
+</div>
Index: framework/webtools/template/entity/FindGeneric.ftl
===================================================================
--- framework/webtools/template/entity/FindGeneric.ftl	(revision 0)
+++ framework/webtools/template/entity/FindGeneric.ftl	(revision 0)
@@ -0,0 +1,42 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+        <form method="post" action="<@ofbizUrl>FindGeneric?entityName=${entityName}</@ofbizUrl>">
+          <input type="hidden" name="find" value="true"/>
+          <input type="hidden" name="searchOptions_collapsed" value="true"/>
+          <table class="basic-table" cellspacing="0">
+            <tr class="header-row-2">
+              <td>${uiLabelMap.WebtoolsFieldName}</td>
+              <td>${uiLabelMap.WebtoolsPk}</td>
+              <td>${uiLabelMap.WebtoolsFieldType}</td>
+              <td>&nbsp;</td>
+            </tr>
+            <#list fieldList as field>
+                <tr>
+                    <td>${field.name}</td>
+                    <td><#if field.isPk == 'Y'>*</#if></td>
+                    <td>${field.javaType},&nbsp;${field.sqlType}</td>
+                    <td><input type="text" name="${field.name}" value="${field.param}" size="40"/></td>
+                </tr>
+            </#list>
+                <tr>
+                    <td colspan="3"><h3>${uiLabelMap.WebtoolsToFindAll} ${entityName}, ${uiLabelMap.WebtoolsLeaveAllEntriesBlank}</h3></td>
+                    <td><input type="submit" value="${uiLabelMap.CommonFind}"/></td>
+                </tr>
+            </table>
+        </form>
Index: framework/webtools/template/entity/ListGeneric.ftl
===================================================================
--- framework/webtools/template/entity/ListGeneric.ftl	(revision 0)
+++ framework/webtools/template/entity/ListGeneric.ftl	(revision 0)
@@ -0,0 +1,57 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+        <#if (arraySize > 0)>
+            <#assign commonUrl="FindGeneric?${curFindString}&amp;searchOptions_collapsed=${(parameters.searchOptions_collapsed)?default(\"false\")}&amp;"/>
+            <@htmlTemplate.nextPrev commonUrl=commonUrl listSize=arraySize viewSize=viewSize viewIndex=viewIndex highIndex=highIndex commonDisplaying=commonDisplaying/>
+        </#if>
+          <table class="basic-table hover-bar" cellspacing="0">
+            <tr class="header-row-2">
+                <td>&nbsp;</td>
+                <#list fieldList as field>
+                    <td>${field.name}</td>
+                </#list>
+            </tr>
+            <#if resultPartialList?has_content>
+                <#assign alt_row = false>
+                <#list records as record>
+                    <tr<#if alt_row> class="alternate-row"</#if>>
+                        <td class="button-col">
+                            <a href='<@ofbizUrl>ViewGeneric?${record.findString}</@ofbizUrl>'>${uiLabelMap.CommonView}</a>
+                        <#if hasDeletePermission == 'Y'>
+                            <a onclick="return confirm ('${uiLabelMap.WebtoolsConfirmDelete}')" href='<@ofbizUrl>UpdateGeneric?${record.findString}&amp;UPDATE_MODE=DELETE</@ofbizUrl>'>${uiLabelMap.CommonDelete}</a>
+                        </#if>
+                        </td>
+                        <#list fieldList as field>
+                            <td>${Static["org.ofbiz.base.util.UtilFormatOut"].makeString(record.fields.get(field.name))}</td>
+                            <#-- <td>${record.fields.get(field.name)!?string}</td> -->
+                        </#list>
+                    </tr>
+                    <#assign alt_row = !alt_row>
+                </#list>
+            <#else>
+                <tr>
+                    <td colspan="${columnCount}">
+                        <h2>${uiLabelMap.WebtoolsNoEntityRecordsFound} ${entityName}.</h2>
+                    </td>
+                </tr>
+            </#if>
+        </table>
+        <#if (arraySize > 0)>
+            <@htmlTemplate.nextPrev commonUrl=commonUrl listSize=arraySize viewSize=viewSize viewIndex=viewIndex  highIndex=highIndex />
+        </#if>
Index: framework/webtools/template/entity/ModelGroupWriter.jsp
===================================================================
--- framework/webtools/template/entity/ModelGroupWriter.jsp	(revision 0)
+++ framework/webtools/template/entity/ModelGroupWriter.jsp	(revision 0)
@@ -0,0 +1,124 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
+<%@ page contentType="text/plain" %><%@ page import="java.util.*, java.io.*, java.net.*, org.ofbiz.base.config.*, org.ofbiz.base.util.*, org.ofbiz.entity.*, org.ofbiz.entity.config.*, org.ofbiz.entity.model.*" %><jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" /><jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /><%
+
+  if("true-not-working".equals(request.getParameter("savetofile"))) {
+    if(security.hasPermission("ENTITY_MAINT", session)) {
+      //save to the file specified in the ModelReader config
+      String controlPath=(String)request.getAttribute("_CONTROL_PATH_");
+      String serverRootUrl=(String)request.getAttribute("_SERVER_ROOT_URL_");
+      ModelGroupReader modelGroupReader = delegator.getModelGroupReader();
+
+      ResourceHandler resourceHandler = null; //modelGroupReader.entityGroupResourceHandler;
+
+      if (resourceHandler.isFileResource()) {
+          String filename = resourceHandler.getFullLocation();
+
+          java.net.URL url = new java.net.URL(serverRootUrl + controlPath + "/view/ModelGroupWriter");
+          HashMap params = new HashMap();
+          HttpClient httpClient = new HttpClient(url, params);
+          InputStream in = httpClient.getStream();
+
+          File newFile = new File(filename);
+          FileWriter newFileWriter = new FileWriter(newFile);
+
+          BufferedReader post = new BufferedReader(new InputStreamReader(in));
+          String line = null;
+          while((line = post.readLine()) != null) {
+            newFileWriter.write(line);
+            newFileWriter.write("\n");
+          }
+          newFileWriter.close();
+          %>
+          If you aren't seeing any exceptions, XML was written successfully to:
+          <%=filename%>
+          from the URL:
+          <%=url.toString()%>
+      <%
+      } else {
+        %>ERROR: This entity group information did not come from a file, so it is not being saved. It came from <%=resourceHandler.toString()%><%
+      }
+    } else {
+      %>ERROR: You do not have permission to use this page (ENTITY_MAINT needed)<%
+    }
+  } else {
+%><?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE entitygroup PUBLIC "-//OFBiz//DTD Entity Group//EN" "http://ofbiz.apache.org/dtds/entitygroup.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<%
+  ModelReader reader = delegator.getModelReader();
+  ModelGroupReader groupReader = delegator.getModelGroupReader();
+
+  Map packages = new HashMap();
+  TreeSet packageNames = new TreeSet();
+
+  //put the entityNames TreeSets in a HashMap by packageName
+  Collection ec = reader.getEntityNames();
+
+  Iterator ecIter = ec.iterator();
+  while(ecIter.hasNext()) {
+    String eName = (String)ecIter.next();
+    ModelEntity ent = reader.getModelEntity(eName);
+    TreeSet entities = (TreeSet) packages.get(ent.getPackageName());
+    if(entities == null) {
+      entities = new TreeSet();
+      packages.put(ent.getPackageName(), entities);
+      packageNames.add(ent.getPackageName());
+    }
+    entities.add(eName);
+  }%>
+<entitygroup><%
+  Iterator piter = packageNames.iterator();
+  while(piter.hasNext()) {
+    String pName = (String) piter.next();
+    TreeSet entities = (TreeSet) packages.get(pName);
+%>
+
+  <!-- ========================================================= -->
+  <!-- <%=pName%> -->
+  <!-- ========================================================= -->
+<%
+    Iterator i = entities.iterator();
+    while (i.hasNext()) {
+      String entityName = (String)i.next();
+      String groupName = groupReader.getEntityGroupName(entityName, delegator.getDelegatorName());
+      if (groupName == null) groupName = "";
+%>
+    <entity-group group="<%=groupName%>" entity="<%=entityName%>" /><%
+    }
+  }%>
+</entitygroup>
+<%}%>
Index: framework/webtools/template/entity/ModelInduceFromDb.jsp
===================================================================
--- framework/webtools/template/entity/ModelInduceFromDb.jsp	(revision 0)
+++ framework/webtools/template/entity/ModelInduceFromDb.jsp	(revision 0)
@@ -0,0 +1,154 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
+<%@ page import="java.util.*, java.io.*, java.net.*, java.sql.*, org.ofbiz.base.util.*, org.ofbiz.entity.*, org.ofbiz.entity.model.*, org.ofbiz.entity.datasource.*" %><jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" /><jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /><%
+
+if(security.hasPermission("ENTITY_MAINT", session)) {
+  String helperName = request.getParameter("helperName");
+  if(helperName == null || helperName.length() <= 0) {
+    response.setContentType("text/html");
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en" dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <title>ModelInduceFromDB</title>
+</head>
+<body>
+<div class='h3'><b>Put the name of the Datasource in the EntityEngine.xml to induce from:</b></div>
+<form action='' method="post">
+    <input type='text' class='inputBox' size='40' name='helperName' />
+    <input type='submit' value='Induce!' />
+</form>
+It's the datasource name. It doesn't need to be associated with a
+ delegator, just defined in entityengine.xml.<br/>
+   <b> Use the browser to view the source and see the entities that were created.</b>
+
+</body>
+</html>
+
+<%
+  } else {
+      response.setContentType("text/xml");
+      Collection messages = new LinkedList();
+      GenericDAO dao = GenericDAO.getGenericDAO(new GenericHelperInfo(null, helperName));
+      List newEntList = dao.induceModelFromDb(messages);
+
+      if(messages.size() > 0) {
+%>
+ERRORS:
+<%
+        Iterator mIter = messages.iterator();
+        while(mIter.hasNext()) {
+%>
+<%=(String)mIter.next()%><%
+        }
+      }
+      if(newEntList != null) {
+        String title = "Entity of the Apache OFBiz Component";
+        String description = "None";
+        String copyright = "Copyright 2001-2012 The Apache Software Foundation";
+        String author = "None";
+        String version = "1.0";
+%><?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+  <!-- ========================================================= -->
+  <!-- ======================== Defaults ======================= -->
+  <!-- ========================================================= -->
+    <title><%=title%></title>
+    <description><%=description%></description>
+    <copyright><%=copyright%></copyright>
+    <author><%=author%></author>
+    <version><%=version%></version>
+
+  <!-- ========================================================= -->
+  <!-- ======================== Data Model ===================== -->
+  <!-- The modules in this file are as follows:                  -->
+  <!-- ========================================================= -->
+
+  <!-- ========================================================= -->
+  <!-- No Package Name -->
+  <!-- ========================================================= -->
+<%
+  Iterator ecIter = newEntList.iterator();
+  while(ecIter.hasNext()) {
+    ModelEntity entity = (ModelEntity) ecIter.next();
+%>
+    <entity entity-name="<%=entity.getEntityName()%>"<%if(!entity.getEntityName().equals(ModelUtil.dbNameToClassName(entity.getPlainTableName())) || !ModelUtil.javaNameToDbName(entity.getEntityName()).equals(entity.getPlainTableName()) ){
+          %> table-name="<%=entity.getPlainTableName()%>"<%}%>
+            package-name="<%=entity.getPackageName()%>"<%if(entity.getDependentOn().length() > 0){%>
+            dependent-on="<%=entity.getDependentOn()%>"<%}%><%if(!title.equals(entity.getTitle())){%>
+            title="<%=entity.getTitle()%>"<%}%><%if(!copyright.equals(entity.getCopyright())){%>
+            copyright="<%=entity.getCopyright()%>"<%}%><%if(!author.equals(entity.getAuthor())){%>
+            author="<%=entity.getAuthor()%>"<%}%><%if(!version.equals(entity.getVersion())){%>
+            version="<%=entity.getVersion()%>"<%}%>><%if(!description.equals(entity.getDescription())){%>
+      <description><%=entity.getDescription()%></description><%}%><%
+  Iterator<ModelField> fieldIterator = entity.getFieldsIterator();
+  while (fieldIterator.hasNext()) {
+    ModelField field = fieldIterator.next();%>
+      <field name="<%=field.getName()%>"<%if(!field.getColName().equals(ModelUtil.javaNameToDbName(field.getName()))){
+      %> col-name="<%=field.getColName()%>"<%}%> type="<%=field.getType()%>"><%
+    for (String valName : field.getValidators()) {
+      %><validate name="<%=valName%>"/><%
+    }%></field><%
+  }
+  Iterator<ModelField> pkIterator = entity.getPksIterator();
+  while (pkIterator.hasNext()) {
+    ModelField field = pkIterator.next();%>
+      <prim-key field="<%=field.getName()%>"/><%
+  }
+  if (entity.getRelationsSize() > 0) {
+    for (int r = 0; r < entity.getRelationsSize(); r++) {
+      ModelRelation relation = entity.getRelation(r);%>
+      <relation type="<%=relation.getType()%>"<%if(relation.getTitle().length() > 0){%> title="<%=relation.getTitle()%>"<%}
+              %> rel-entity-name="<%=relation.getRelEntityName()%>"><%for(ModelKeyMap keyMap : relation.getKeyMaps()){ %>
+        <key-map field-name="<%=keyMap.getFieldName()%>"<%if(!keyMap.getFieldName().equals(keyMap.getRelFieldName())){%> rel-field-name="<%=keyMap.getRelFieldName()%>"<%}%> /><%}%>
+      </relation><%
+    }
+  }%>
+    </entity><%
+  }%>
+</entitymodel>
+<%
+      }
+    }
+  }
+else {
+  %>ERROR: You do not have permission to use this page (ENTITY_MAINT needed)<%
+}
+%>
Index: framework/webtools/template/entity/ModelWriter.jsp
===================================================================
--- framework/webtools/template/entity/ModelWriter.jsp	(revision 0)
+++ framework/webtools/template/entity/ModelWriter.jsp	(revision 0)
@@ -0,0 +1,249 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
+<%@ page contentType="text/plain" %><%@ page import="java.util.*, java.io.*, java.net.*, org.ofbiz.base.config.*, org.ofbiz.base.util.*, org.ofbiz.entity.*, org.ofbiz.entity.config.*, org.ofbiz.entity.model.*" %><jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" /><jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /><%
+try {
+if (security.hasPermission("ENTITY_MAINT", session) || request.getParameter("originalLoaderName") != null) {
+  if ("true".equals(request.getParameter("savetofile"))) {
+    //save to the file specified in the ModelReader config
+    String controlPath = (String) request.getAttribute("_CONTROL_PATH_");
+    String serverRootUrl = (String) request.getAttribute("_SERVER_ROOT_URL_");
+    ModelReader modelReader = delegator.getModelReader();
+
+    Iterator handlerIter = modelReader.getResourceHandlerEntitiesKeyIterator();
+    while (handlerIter.hasNext()) {
+      ResourceHandler resourceHandler = (ResourceHandler) handlerIter.next();
+      if (resourceHandler.isFileResource()) {
+          String filename = resourceHandler.getFullLocation();
+
+          java.net.URL url = new java.net.URL(serverRootUrl + controlPath + "/ModelWriter");
+          HashMap params = new HashMap();
+          params.put("originalLoaderName", resourceHandler.getLoaderName());
+          params.put("originalLocation", resourceHandler.getLocation());
+          HttpClient httpClient = new HttpClient(url, params);
+          InputStream in = httpClient.getStream();
+
+          File newFile = new File(filename);
+          FileWriter newFileWriter = new FileWriter(newFile);
+
+          BufferedReader post = new BufferedReader(new InputStreamReader(in));
+          String line = null;
+          while ((line = post.readLine()) != null) {
+            newFileWriter.write(line);
+            newFileWriter.write("\n");
+          }
+          newFileWriter.close();
+          %>
+              If you aren't seeing any exceptions, XML was written successfully to:
+              <%=filename%>
+              from the URL:
+              <%=url.toString()%>?originalLoaderName=<%=resourceHandler.getLoaderName()%>&originalLocation=<%=resourceHandler.getLocation()%>
+          <%
+      } else {
+          %>Cannot write to location <%=resourceHandler.getLocation()%> from
+          loader <%=resourceHandler.getLoaderName()%>, it is not a file.<%
+      }
+    }
+  } else {
+      String title = "Entity of the Apache OFBiz Component";
+      String description = "None";
+      String copyright = "Copyright 2001-2012 The Apache Software Foundation";
+      String author = "None";
+      String version = "1.0";
+%><?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE entitymodel PUBLIC "-//OFBiz//DTD Entity Model//EN" "http://ofbiz.apache.org/dtds/entitymodel.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<%
+  //GenericDelegator delegator = GenericHelperFactory.getDefaultHelper();
+  ModelReader reader = delegator.getModelReader();
+  Map packages = new HashMap();
+  TreeSet packageNames = new TreeSet();
+
+  // ignore fields names
+  List ignoredFields = UtilMisc.toList("lastUpdatedStamp", "lastUpdatedTxStamp", "createdStamp", "createdTxStamp");
+  //put the entityNames TreeSets in a HashMap by packageName
+  Collection ec = null;
+
+  String originalLoaderName = request.getParameter("originalLoaderName");
+  String originalLocation = request.getParameter("originalLocation");
+  if (originalLoaderName != null && originalLocation != null) {
+    ec = reader.getResourceHandlerEntities(new MainResourceHandler(EntityConfig.ENTITY_ENGINE_XML_FILENAME, originalLoaderName, originalLocation));
+  } else {
+    ec = reader.getEntityNames();
+  }
+
+  Iterator ecIter = ec.iterator();
+  while(ecIter.hasNext()) {
+    String eName = (String) ecIter.next();
+    ModelEntity ent = reader.getModelEntity(eName);
+    TreeSet entities = (TreeSet) packages.get(ent.getPackageName());
+    if (entities == null) {
+      entities = new TreeSet();
+      packages.put(ent.getPackageName(), entities);
+      packageNames.add(ent.getPackageName());
+    }
+    entities.add(eName);
+  }%>
+<entitymodel>
+  <!-- ========================================================= -->
+  <!-- ======================== Defaults ======================= -->
+  <!-- ========================================================= -->
+    <title><%=title%></title>
+    <description><%=description%></description>
+    <copyright><%=copyright%></copyright>
+    <author><%=author%></author>
+    <version><%=version%></version>
+
+  <!-- ========================================================= -->
+  <!-- ======================== Data Model ===================== -->
+  <!-- The modules in this file are as follows:                  --><%
+  Iterator packageNameIter = packageNames.iterator();
+  while(packageNameIter.hasNext()) {
+    String pName = (String)packageNameIter.next();%>
+  <!--  - <%=pName%> --><%
+  }%>
+  <!-- ========================================================= -->
+<%
+  Iterator piter = packageNames.iterator();
+  while(piter.hasNext()) {
+    String pName = (String)piter.next();
+    TreeSet entities = (TreeSet)packages.get(pName);
+%>
+
+  <!-- ========================================================= -->
+  <!-- <%=pName%> -->
+  <!-- ========================================================= -->
+<%
+    Iterator i = entities.iterator();
+    while (i.hasNext()) {
+      String entityName = (String)i.next();
+      ModelEntity entity = reader.getModelEntity(entityName);
+      if (entity instanceof ModelViewEntity) {
+        ModelViewEntity viewEntity = (ModelViewEntity)entity;
+%>
+    <view-entity entity-name="<%=entity.getEntityName()%>"
+            package-name="<%=entity.getPackageName()%>"<%if (entity.getDependentOn().length() > 0) {%>
+            dependent-on="<%=entity.getDependentOn()%>"<%}%><%if (entity.getNeverCache()) {%>
+            never-cache="true"<%}%><%if (!title.equals(entity.getTitle())) {%>
+            title="<%=entity.getTitle()%>"<%}%><%if (!copyright.equals(entity.getCopyright())) {%>
+            copyright="<%=entity.getCopyright()%>"<%}%><%if (!author.equals(entity.getAuthor())) {%>
+            author="<%=entity.getAuthor()%>"<%}%><%if (!version.equals(entity.getVersion())) {%>
+            version="<%=entity.getVersion()%>"<%}%>><%if (!description.equals(entity.getDescription())) {%>
+      <description><%=entity.getDescription()%></description><%}%><%
+  Iterator meIter = viewEntity.getAllModelMemberEntities().iterator();
+  while(meIter.hasNext()) {
+    ModelViewEntity.ModelMemberEntity modelMemberEntity = (ModelViewEntity.ModelMemberEntity) meIter.next();
+%>
+      <member-entity entity-alias="<%=modelMemberEntity.getEntityAlias()%>" entity-name="<%=modelMemberEntity.getEntityName()%>"/><%
+  }
+  for (int y = 0; y < viewEntity.getAliasesSize(); y++) {
+    ModelViewEntity.ModelAlias alias = viewEntity.getAlias(y);%>
+      <alias entity-alias="<%=alias.getEntityAlias()%>" name="<%=alias.getName()%>"<%if (!alias.getName().equals(alias.getField())) {
+      %> field="<%=alias.getField()%>"<%}%><%if (alias.getIsPk() != null) {
+      %> prim-key="<%=alias.getIsPk().toString()%>"<%}%><%if (alias.getGroupBy()) {
+      %> group-by="true"<%}%><%if (UtilValidate.isNotEmpty(alias.getFunction())) {
+      %> function="<%=alias.getFunction()%>"<%}%>/><%
+  }
+  for (int r = 0; r < viewEntity.getViewLinksSize(); r++) {
+    ModelViewEntity.ModelViewLink viewLink = viewEntity.getViewLink(r);%>
+      <view-link entity-alias="<%=viewLink.getEntityAlias()%>" rel-entity-alias="<%=viewLink.getRelEntityAlias()%>"<%
+          if (viewLink.isRelOptional()) {%> rel-optional="true"<%}%>><%for (int km = 0; km < viewLink.getKeyMapsSize(); km++){ ModelKeyMap keyMap = viewLink.getKeyMap(km);%>
+        <key-map field-name="<%=keyMap.getFieldName()%>"<%if (!keyMap.getFieldName().equals(keyMap.getRelFieldName())) {%> rel-field-name="<%=keyMap.getRelFieldName()%>"<%}%>/><%}%>
+      </view-link><%
+  }
+  if (entity.getRelationsSize() > 0) {
+    for (int r = 0; r < entity.getRelationsSize(); r++) {
+      ModelRelation relation = entity.getRelation(r);%>
+      <relation type="<%=relation.getType()%>"<%if (relation.getTitle().length() > 0) {%> title="<%=relation.getTitle()%>"<%}
+              %> rel-entity-name="<%=relation.getRelEntityName()%>"><%for (int km = 0; km < relation.getKeyMapsSize(); km++){ ModelKeyMap keyMap = relation.getKeyMap(km);%>
+        <key-map field-name="<%=keyMap.getFieldName()%>"<%if (!keyMap.getFieldName().equals(keyMap.getRelFieldName())) {%> rel-field-name="<%=keyMap.getRelFieldName()%>"<%}%>/><%}%>
+      </relation><%
+    }
+  }%>
+    </view-entity><%
+      }
+      else {
+%>
+    <entity entity-name="<%=entity.getEntityName()%>"<%if (!entity.getEntityName().equals(ModelUtil.dbNameToClassName(entity.getPlainTableName()))){
+          %> table-name="<%=entity.getPlainTableName()%>"<%}%>
+            package-name="<%=entity.getPackageName()%>"<%if (entity.getDependentOn().length() > 0) {%>
+            dependent-on="<%=entity.getDependentOn()%>"<%}%><%if (entity.getDoLock()) {%>
+            enable-lock="true"<%}%><%if (entity.getNeverCache()) {%>
+            never-cache="true"<%}%><%if (!title.equals(entity.getTitle())) {%>
+            title="<%=entity.getTitle()%>"<%}%><%if (!copyright.equals(entity.getCopyright())) {%>
+            copyright="<%=entity.getCopyright()%>"<%}%><%if (!author.equals(entity.getAuthor())) {%>
+            author="<%=entity.getAuthor()%>"<%}%><%if (!version.equals(entity.getVersion())) {%>
+            version="<%=entity.getVersion()%>"<%}%>><%if (!description.equals(entity.getDescription())) {%>
+      <description><%=entity.getDescription()%></description><%}%><%
+  Iterator<ModelField> fieldIterator = entity.getFieldsIterator();
+  while (fieldIterator.hasNext()) {
+    ModelField field = fieldIterator.next();
+    if (!ignoredFields.contains(field.getName())) {%>
+      <field name="<%=field.getName()%>"<%if (!field.getName().equals(ModelUtil.dbNameToVarName(field.getColName()))){
+      %> col-name="<%=field.getColName()%>"<%}%> type="<%=field.getType()%>"><%
+    for (int v = 0; v<field.getValidatorsSize(); v++) {
+      String valName = field.getValidator(v);
+      %><validate name="<%=valName%>"/><%
+    }%></field><%
+    }}
+  Iterator<ModelField> pkIterator = entity.getPksIterator();
+  while (pkIterator.hasNext()) {
+    ModelField field = pkIterator.next();%>
+      <prim-key field="<%=field.getName()%>"/><%
+  }
+  if (entity.getRelationsSize() > 0) {
+    for (int r=0; r<entity.getRelationsSize(); r++) {
+      ModelRelation relation = entity.getRelation(r);%>
+      <relation type="<%=relation.getType()%>"<%if (relation.getFkName().length() > 0) {%> fk-name="<%=relation.getFkName()%>"<%}
+              %><%if (relation.getTitle().length() > 0) {%> title="<%=relation.getTitle()%>"<%}
+              %> rel-entity-name="<%=relation.getRelEntityName()%>"><%for (int km = 0; km < relation.getKeyMapsSize(); km++){ ModelKeyMap keyMap = relation.getKeyMap(km);%>
+        <key-map field-name="<%=keyMap.getFieldName()%>"<%if (!keyMap.getFieldName().equals(keyMap.getRelFieldName())) {%> rel-field-name="<%=keyMap.getRelFieldName()%>"<%}%>/><%}%>
+      </relation><%
+    }
+  }%>
+    </entity><%
+      }
+    }
+  }%>
+</entitymodel>
+<%
+  }
+} else {
+  %>ERROR: You do not have permission to use this page (ENTITY_MAINT needed)<%
+}
+} catch (Exception e) {
+    Debug.log(e);
+}
+%>
Index: framework/webtools/template/entity/ProgramExport.ftl
===================================================================
--- framework/webtools/template/entity/ProgramExport.ftl	(revision 0)
+++ framework/webtools/template/entity/ProgramExport.ftl	(revision 0)
@@ -0,0 +1,36 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+
+<div class="screenlet">
+  <div class="screenlet">
+    <div class="screenlet-title-bar">
+      <h3>${uiLabelMap.WebtoolsEntityXMLRepresentation}</h3>
+    </div>
+    <div class="screenlet-body">
+      <p>
+      <#if xmlDoc?has_content>
+        ${Static["org.ofbiz.base.util.UtilXml"].writeXmlDocument(xmlDoc)?replace("\n", "<br />")?replace("    ", "&nbsp;&nbsp;&nbsp;&nbsp;")}
+      </#if>
+      </p>
+    </div>
+  </div>
+  <br class="clear"/>
+</div>
+
Index: framework/webtools/template/entity/ViewGeneric.ftl
===================================================================
--- framework/webtools/template/entity/ViewGeneric.ftl	(revision 0)
+++ framework/webtools/template/entity/ViewGeneric.ftl	(revision 0)
@@ -0,0 +1,281 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#assign enableEdit = parameters.enableEdit?default("false")>
+<script language="JavaScript" type="text/javascript">
+var numTabs=${(entity.getRelationsSize()+1)};
+function ShowTab(lname) {
+  for(inc=1; inc <= numTabs; inc++) {
+    // document.getElementById('area' + inc).className = (lname == 'tab' + inc) ? 'screenlet' : 'topcontainerhidden';
+    // style of topcontainerhidden 
+    // .topcontainerhidden { POSITION: absolute; VISIBILITY: hidden; }
+    var elem = document.getElementById('area' + inc);
+    if (lname == 'tab' + inc){
+      elem.className = 'screenlet';
+    }
+    else {
+      elem.className = 'topcontainerhidden';
+      elem.style.position = 'absolute';
+      elem.style.visibility = 'hidden';
+    }
+  }
+}
+</script>
+
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <li class="h3">${uiLabelMap.WebtoolsViewValue}</li>
+    </ul>
+    <br class="clear"/>
+  </div>
+  <div class="screenlet-body">
+    <h2>${uiLabelMap.WebtoolsForEntity}: ${entityName}</h2>
+    <h2>${uiLabelMap.WebtoolsWithPk}: ${findByPk}</h2>
+    <br />
+    <div class="button-bar">
+      <a href='<@ofbizUrl>FindGeneric?entityName=${entityName}&amp;find=true&amp;VIEW_SIZE=50&amp;VIEW_INDEX=0</@ofbizUrl>' class="buttontext">${uiLabelMap.WebtoolsBackToFindScreen}</a>
+      <#if enableEdit = "false">
+        <#if hasCreatePermission>
+          <a href='<@ofbizUrl>ViewGeneric?entityName=${entityName}&amp;enableEdit=true</@ofbizUrl>' class="buttontext create">${uiLabelMap.CommonCreateNew}</a>
+          <a href="<@ofbizUrl>ViewGeneric?${curFindString}&amp;enableEdit=true</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
+        </#if>
+        <#if value?has_content>
+          <#if hasDeletePermission>
+            <a href='<@ofbizUrl>UpdateGeneric?UPDATE_MODE=DELETE&amp;${curFindString}</@ofbizUrl>' class="buttontext delete">${uiLabelMap.WebtoolsDeleteThisValue}</a>
+          </#if>
+        </#if>
+      </#if>
+    </div>
+    <#if value?has_content>
+      <form name="relationForm">
+        <p><b>${uiLabelMap.CommonView}</b></p>
+        <select name="viewRelated" onchange="javascript:ShowTab(this.options[this.selectedIndex].value)">
+          <option value="tab1">${entityName}</option>
+          <#list relationFieldList as relation>
+            <option value="tab${(relation_index+2)}">${relation.title}${relation.relEntityName} (${relation.type})</option>
+          </#list>
+        </select>
+      </form>
+      <br />
+    </#if>
+    <div id="area1" class="screenlet">
+      <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.WebtoolsEntityCurrentValue}</h3>
+      </div>
+      <#if value?has_content>
+        <#assign alt_row = false>
+        <table class="basic-table" cellspacing="0">
+          <#list fields as field>
+            <tr<#if alt_row> class="alternate-row"</#if>>
+              <td class="label">${field.name}</td>
+              <td>${field.value}</td>
+            </tr>
+            <#assign alt_row = !alt_row>
+          </#list>
+        </table>
+      <#else>
+        ${uiLabelMap.WebtoolsSpecifiedEntity1} ${entityName} ${uiLabelMap.WebtoolsSpecifiedEntity2}.
+      </#if>
+    </div>
+    <#if enableEdit = "true">
+      <#if hasUpdatePermission || hasCreatePermission>
+        <#assign alt_row = false>
+        <div id="area2" class="screenlet">
+          <div class="screenlet-title-bar">
+            <h3>${uiLabelMap.WebtoolsEntityEditValue}</h3>
+          </div>
+          <#if pkNotFound>
+            <p>${uiLabelMap.WebtoolsEntityName} ${entityName} ${uiLabelMap.WebtoolsWithPk} ${findByPk} ${uiLabelMap.WebtoolsSpecifiedEntity2}.</p>
+          </#if>
+          <form action='<@ofbizUrl>UpdateGeneric?entityName=${entityName}</@ofbizUrl>' method="post" name="updateForm">
+            <#assign showFields = true>
+            <#assign alt_row = false>
+            <table class="basic-table" cellspacing="0">
+              <#if value?has_content>
+                <#if hasUpdatePermission>
+                  <#if newFieldPkList?has_content>
+                    <input type="hidden" name="UPDATE_MODE" value="UPDATE"/>
+                    <#list newFieldPkList as field>
+                      <tr<#if alt_row> class="alternate-row"</#if>>
+                        <td class="label">${field.name}</td>
+                        <td>
+                          <input type="hidden" name="${field.name}" value="${field.value}"/>
+                          ${field.value}
+                        </td>
+                      </tr>
+                      <#assign alt_row = !alt_row>
+                    </#list>
+                  </#if>
+                <#else>
+                  ${uiLabelMap.WebtoolsEntityCreatePermissionError} ${entityName} ${plainTableName}
+                  <#assign showFields = false>
+                </#if>
+              <#else>
+                <#if hasCreatePermission>
+                  <#if newFieldPkList?has_content>
+                    <p>${uiLabelMap.WebtoolsYouMayCreateAnEntity}</p>
+                    <input type="hidden" name="UPDATE_MODE" value="CREATE"/>
+                    <#list newFieldPkList as field>
+                      <tr<#if alt_row> class="alternate-row"</#if>>
+                        <td class="label">${field.name}</td>
+                        <td>
+                          <#if field.fieldType == 'DateTime'>
+                            ${uiLabelMap.CommonFormatDateTime}<@htmlTemplate.renderDateTimeField name="${field.name}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                          <#elseif field.fieldType == 'Date'>
+                            ${uiLabelMap.CommonFormatDate}<@htmlTemplate.renderDateTimeField name="${field.name}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                          <#elseif field.fieldType == 'Time'>
+                            ${uiLabelMap.CommonFormatTime}<input type="text" size="6" maxlength="10" name="${field.name}" value="${field.value}" />
+                          <#elseif field.fieldType == 'Integer'>
+                            <input type="text" size="20" name="${field.name}" value="${field.value}" />
+                          <#elseif field.fieldType == 'Long'>
+                            <input type="text" size="20" name="${field.name}" value="${field.value}" />
+                          <#elseif field.fieldType == 'Double'>
+                            <input type="text" size="20" name="${field.name}" value="${field.value}" />
+                          <#elseif field.fieldType == 'Float'>
+                            <input type="text" size="20" name="${field.name}" value="${field.value}" />
+                          <#elseif field.fieldType == 'StringOneRow'>
+                            <input type="text" size="${field.stringLength}" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}" />
+                          <#elseif field.fieldType == 'String'>
+                            <input type="text" size="80" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}" />
+                          <#elseif field.fieldType == 'Textarea'>
+                            <textarea cols="60" rows="3" maxlength="${field.stringLength}" name="${field.name}">${field.value}</textarea>
+                          <#else>
+                            <input type="text" size="20" name="${field.name}" value="${field.value}" />
+                          </#if>
+                        </td>
+                      </tr>
+                      <#assign alt_row = !alt_row>
+                    </#list>
+                  </#if>
+                <#else>
+                  <p>${uiLabelMap.WebtoolsEntityCreatePermissionError} ${entityName} ${plainTableName}</p>
+                  <#assign showFields = false>
+                </#if>
+              </#if>
+              <#if showFields>
+                <#if newFieldNoPkList?has_content>
+                  <#assign alt_row = false>
+                  <#list newFieldNoPkList as field>
+                    <tr<#if alt_row> class="alternate-row"</#if>>
+                      <td class="label">${field.name}</td>
+                      <td>
+                        <#if field.fieldType == 'DateTime'>
+                          ${uiLabelMap.CommonFormatDateTime}<@htmlTemplate.renderDateTimeField name="${field.name}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                        <#elseif field.fieldType == 'Date'>
+                          ${uiLabelMap.CommonFormatDate}<@htmlTemplate.renderDateTimeField name="${field.name}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                        <#elseif field.fieldType == 'Time'>
+                          ${uiLabelMap.CommonFormatTime}<input type="text" size="6" maxlength="10" name="${field.name}" value="${field.value}" />
+                        <#elseif field.fieldType == 'Integer'>
+                          <input type="text" size="20" name="${field.name}" value="${field.value}" />
+                        <#elseif field.fieldType == 'Long'>
+                          <input type="text" size="20" name="${field.name}" value="${field.value}" />
+                        <#elseif field.fieldType == 'Double'>
+                          <input type="text" size="20" name="${field.name}" value="${field.value}" />
+                        <#elseif field.fieldType == 'Float'>
+                          <input type="text" size="20" name="${field.name}" value="${field.value}" />
+                        <#elseif field.fieldType == 'StringOneRow'>
+                          <input type="text" size="${field.stringLength}" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}" />
+                        <#elseif field.fieldType == 'String'>
+                          <input type="text" size="80" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}" />
+                        <#elseif field.fieldType == 'Textarea'>
+                          <textarea cols="60" rows="3" maxlength="${field.stringLength}" name="${field.name}">${field.value}</textarea>
+                        <#else>
+                          <input type="text" size="20" name="${field.name}" value="${field.value}" />
+                        </#if>
+                      </td>
+                    </tr>
+                    <#assign alt_row = !alt_row>
+                  </#list>
+                  <#if value?has_content>
+                    <#assign button = "${uiLabelMap.CommonUpdate}">
+                  <#else>
+                    <#assign button = "${uiLabelMap.CommonCreate}">
+                  </#if>
+                  <tr<#if alt_row> class="alternate-row"</#if>>
+                    <td>&nbsp;</td>
+                    <td>
+                      <input type="submit" name="Update" value="${button}" />
+                      <a href="<@ofbizUrl>ViewGeneric?${curFindString}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancel}</a>
+                    </td>
+                  </tr>
+                </#if>
+              </#if>
+            </table>
+          </form>
+        </div>
+      </#if>
+    </#if>
+    <#if relationFieldList?has_content>
+      <#list relationFieldList as relation>
+          <div id="area${(relation_index + 2)}" class="topcontainerhidden">
+            <div class="screenlet-title-bar">
+              <ul>
+                <li class="h3">${uiLabelMap.WebtoolsRelatedEntity}: ${relation.title}${relation.relatedTable} (${relation.type})</li>
+                <li><a href="<@ofbizUrl>FindGeneric?${relation.encodeRelatedEntityFindString}&amp;find=true</@ofbizUrl>">${uiLabelMap.CommonFind}</a></li>
+                <#if relation.valueRelated?has_content>
+                  <li><a href="<@ofbizUrl>ViewGeneric?${relation.encodeRelatedEntityFindString}</@ofbizUrl>">${uiLabelMap.CommonView}</a></li>
+                </#if>
+                <#if hasAllCreate || relCreate>
+                  <li><a href="<@ofbizUrl>ViewGeneric?${relation.encodeRelatedEntityFindString}&amp;enableEdit=true</@ofbizUrl>">${uiLabelMap.CommonCreate}</a></li>
+                </#if>
+              </ul>
+              <br class="clear"/>
+            </div>
+            <#if relation.valueRelated?has_content>
+              <table class="basic-table" cellspacing="0">
+                <#assign alt_row = false>
+                <tr<#if alt_row> class="alternate-row"</#if>>
+                  <td class="label">${uiLabelMap.WebtoolsPk}</td>
+                  <td>${relation.valueRelatedPk}</td>
+                </tr>
+                <#list relation.relatedFieldsList as relatedField>
+                  <tr<#if alt_row> class="alternate-row"</#if>>
+                    <td class="label">${relatedField.name}</td>
+                    <td>${relatedField.value}</td>
+                  </tr>
+                  <#assign alt_row = !alt_row>
+                </#list>
+              </table>
+            <#else>
+              <#if "one" = relation.type>
+              <b>${uiLabelMap.WebtoolsNoValueFoundFor}</b> ${relation.title}${relation.relatedTable}.
+              <#else/>
+              <a href="<@ofbizUrl>FindGeneric?${relation.encodeRelatedEntityFindString}&amp;find=true</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonFind}</a>
+              </#if>
+            </#if>
+          </div>
+      </#list>
+    </#if>
+  </div>
+  <div class="screenlet">
+    <div class="screenlet-title-bar">
+      <h3>${uiLabelMap.WebtoolsEntityXMLRepresentation}</h3>
+    </div>
+    <div class="screenlet-body">
+      <p>
+      <#if value?has_content>
+        <#assign valueXmlDoc = Static["org.ofbiz.entity.GenericValue"].makeXmlDocument([value]) />
+        ${Static["org.ofbiz.base.util.UtilXml"].writeXmlDocument(valueXmlDoc)?replace("\n", "<br />")?replace("    ", "&nbsp;&nbsp;&nbsp;&nbsp;")}
+      </#if>
+      </p>
+    </div>
+  </div>
+  <br class="clear"/>
+</div>
Index: framework/webtools/template/entity/ViewRelations.ftl
===================================================================
--- framework/webtools/template/entity/ViewRelations.ftl	(revision 0)
+++ framework/webtools/template/entity/ViewRelations.ftl	(revision 0)
@@ -0,0 +1,63 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <li class="h3">${uiLabelMap.WebtoolsRelations}</li>
+    </ul>
+    <br class="clear"/>
+  </div>
+  <div class="screenlet-body">
+    <#if hasViewPermission>
+        <br />
+        <h2>${uiLabelMap.WebtoolsForEntity}: ${entityName}</h2>
+        <br />
+        <div class="button-bar">
+            <a href="<@ofbizUrl>FindGeneric?entityName=${entityName}&amp;find=true&amp;VIEW_SIZE=50&amp;VIEW_INDEX=0</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsBackToFindScreen}</a>
+        </div>
+        <br />
+        <table class="basic-table hover-bar" cellspacing="0">
+            <tr class="header-row">
+                <td>${uiLabelMap.WebtoolsTitle}</td>
+                <td>${uiLabelMap.WebtoolsRelatedEntity}</td>
+                <td>${uiLabelMap.WebtoolsRelationType}</td>
+                <td>${uiLabelMap.WebtoolsFKName}</td>
+                <td>${uiLabelMap.WebtoolsFieldsList}</td>
+            </tr>
+            <#assign alt_row = false>
+            <#list relations as relation>
+                <tr<#if alt_row> class="alternate-row"</#if>>
+                    <td>${relation.title}</td>
+                    <td class="button-col"><a href='<@ofbizUrl>FindGeneric?entityName=${relation.relEntityName}&amp;find=true&amp;VIEW_SIZE=50&amp;VIEW_INDEX=0</@ofbizUrl>'>${relation.relEntityName}</a></td>
+                    <td>${relation.type}</td>
+                    <td>${relation.fkName}</td>
+                    <td>
+                        <#list relation.relFields as field>
+                            ${field.fieldName} -> ${field.relFieldName}<br />
+                        </#list>
+                    </td>
+                </tr>
+                <#assign alt_row = !alt_row>
+            </#list>
+        </table>
+    <#else>
+        <h3>${uiLabelMap.WebtoolsEntityCreatePermissionError} ${entityName} ${plainTableName}.</h3>
+    </#if>
+  </div>
+</div>
Index: framework/webtools/template/entity/dataMySql.jsp
===================================================================
--- framework/webtools/template/entity/dataMySql.jsp	(revision 0)
+++ framework/webtools/template/entity/dataMySql.jsp	(revision 0)
@@ -0,0 +1,43 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
+<%@ page contentType="text/plain" %><%@ page import="java.util.*" %><%@ page import="org.ofbiz.entity.*" %><%@ page import="org.ofbiz.entity.model.*" %><jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" /><jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /><%
+if(security.hasPermission("ENTITY_MAINT", session)) {
+  ModelReader reader = delegator.getModelReader();
+  Collection ec = reader.getEntityNames();
+  TreeSet entities = new TreeSet(ec);
+  Iterator classNamesIterator = entities.iterator();
+  while(classNamesIterator != null && classNamesIterator.hasNext()) { ModelEntity entity = reader.getModelEntity((String)classNamesIterator.next());%>
+INSERT INTO SECURITY_PERMISSION (PERMISSION_ID,DESCRIPTION) VALUES ('<%=entity.getPlainTableName()%>_ADMIN','Permission to Administer a <%=entity.getEntityName()%> entity.');
+INSERT INTO SECURITY_PERMISSION (PERMISSION_ID,DESCRIPTION) VALUES ('<%=entity.getPlainTableName()%>_VIEW','Permission to View a <%=entity.getEntityName()%> entity.');
+INSERT INTO SECURITY_PERMISSION (PERMISSION_ID,DESCRIPTION) VALUES ('<%=entity.getPlainTableName()%>_CREATE','Permission to Create a <%=entity.getEntityName()%> entity.');
+INSERT INTO SECURITY_PERMISSION (PERMISSION_ID,DESCRIPTION) VALUES ('<%=entity.getPlainTableName()%>_UPDATE','Permission to Update a <%=entity.getEntityName()%> entity.');
+INSERT INTO SECURITY_PERMISSION (PERMISSION_ID,DESCRIPTION) VALUES ('<%=entity.getPlainTableName()%>_DELETE','Permission to Delete a <%=entity.getEntityName()%> entity.');
+
+INSERT INTO SECURITY_GROUP_PERMISSION (GROUP_ID,PERMISSION_ID) VALUES ('FULLADMIN','<%=entity.getPlainTableName()%>_ADMIN');
+INSERT INTO SECURITY_GROUP_PERMISSION (GROUP_ID,PERMISSION_ID) VALUES ('FLEXADMIN','<%=entity.getPlainTableName()%>_VIEW');
+INSERT INTO SECURITY_GROUP_PERMISSION (GROUP_ID,PERMISSION_ID) VALUES ('FLEXADMIN','<%=entity.getPlainTableName()%>_CREATE');
+INSERT INTO SECURITY_GROUP_PERMISSION (GROUP_ID,PERMISSION_ID) VALUES ('FLEXADMIN','<%=entity.getPlainTableName()%>_UPDATE');
+INSERT INTO SECURITY_GROUP_PERMISSION (GROUP_ID,PERMISSION_ID) VALUES ('FLEXADMIN','<%=entity.getPlainTableName()%>_DELETE');
+<%
+  }
+}
+else {
+  %>ERROR: You do not have permission to use this page (ENTITY_MAINT needed)<%
+}
+%>
Index: framework/webtools/template/entity/droptablesMySql.jsp
===================================================================
--- framework/webtools/template/entity/droptablesMySql.jsp	(revision 0)
+++ framework/webtools/template/entity/droptablesMySql.jsp	(revision 0)
@@ -0,0 +1,32 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
+<%@ page contentType="text/plain" %><%@ page import="java.util.*" %><%@ page import="org.ofbiz.entity.*" %><%@ page import="org.ofbiz.entity.model.*" %><jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" /><jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /><%
+if(security.hasPermission("ENTITY_MAINT", session)) {
+  ModelReader reader = delegator.getModelReader();
+  Collection ec = reader.getEntityNames();
+  TreeSet entities = new TreeSet(ec);
+  Iterator classNamesIterator = entities.iterator();
+  while(classNamesIterator != null && classNamesIterator.hasNext()) { ModelEntity entity = reader.getModelEntity((String)classNamesIterator.next());%>
+DROP TABLE IF EXISTS <%=entity.getPlainTableName()%>;<%}%>
+<%
+}
+else {
+  %>ERROR: You do not have permission to use this page (ENTITY_MAINT needed)<%
+}
+%>
Index: framework/webtools/template/entity/droptablesplain.jsp
===================================================================
--- framework/webtools/template/entity/droptablesplain.jsp	(revision 0)
+++ framework/webtools/template/entity/droptablesplain.jsp	(revision 0)
@@ -0,0 +1,32 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
+<%@ page contentType="text/plain" %><%@ page import="java.util.*" %><%@ page import="org.ofbiz.entity.*" %><%@ page import="org.ofbiz.entity.model.*" %><jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" /><jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /><%
+if(security.hasPermission("ENTITY_MAINT", session)) {
+  ModelReader reader = delegator.getModelReader();
+  Collection ec = reader.getEntityNames();
+  TreeSet entities = new TreeSet(ec);
+  Iterator classNamesIterator = entities.iterator();
+  while(classNamesIterator != null && classNamesIterator.hasNext()) { ModelEntity entity = reader.getModelEntity((String)classNamesIterator.next());%>
+DROP TABLE <%=entity.getPlainTableName()%>;<%}%>
+<%
+}
+else {
+  %>ERROR: You do not have permission to use this page (ENTITY_MAINT needed)<%
+}
+%>
Index: framework/webtools/template/entity/tablesMySql.jsp
===================================================================
--- framework/webtools/template/entity/tablesMySql.jsp	(revision 0)
+++ framework/webtools/template/entity/tablesMySql.jsp	(revision 0)
@@ -0,0 +1,36 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
+<%@ page contentType="text/plain" %><%@ page import="java.util.*" %><%@ page import="org.ofbiz.entity.*" %><%@ page import="org.ofbiz.entity.model.*" %><jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" /><jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /><%
+if(security.hasPermission("ENTITY_MAINT", session)) {
+  ModelReader reader = delegator.getModelReader();
+  Collection<String> ec = reader.getEntityNames();
+  TreeSet<String> entities = new TreeSet<String>(ec);
+  Iterator<String> classNamesIterator = entities.iterator();
+  while(classNamesIterator != null && classNamesIterator.hasNext()) { ModelEntity entity = reader.getModelEntity((String)classNamesIterator.next());%>
+CREATE TABLE <%=entity.getPlainTableName()%> (<%for (String fieldName : entity.getAllFieldNames()){ModelField field=entity.getField(fieldName); ModelFieldType type = delegator.getEntityFieldType(entity, field.getType());%><%if(field.getIsPk()){%>
+  <%=field.getColName()%> <%=type.getSqlType()%> NOT NULL,<%}else{%>
+  <%=field.getColName()%> <%=type.getSqlType()%>,<%}%><%}%>
+  CONSTRAINT PK_<%=entity.getPlainTableName()%> PRIMARY KEY (<%=entity.colNameString(entity.getPkFieldsUnmodifiable())%>));
+<%}%>
+<%
+}
+else {
+  %>ERROR: You do not have permission to use this page (ENTITY_MAINT needed)<%
+}
+%>
Index: framework/webtools/template/entity/xmldsdump.ftl
===================================================================
--- framework/webtools/template/entity/xmldsdump.ftl	(revision 0)
+++ framework/webtools/template/entity/xmldsdump.ftl	(revision 0)
@@ -0,0 +1,130 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#if tobrowser?? && tobrowser>
+<h1>${uiLabelMap.WebtoolsExportFromDataSource}</h1>
+<br />
+<p>This page can be used to export data from the database. The exported documents will have a root tag of "&lt;entity-engine-xml&gt;".</p>
+<hr />
+<#if security.hasPermission("ENTITY_MAINT", session)>
+    <a href="<@ofbizUrl>xmldsrawdump</@ofbizUrl>" class="buttontext" target="_blank">Click Here to Get Data (or save to file)</a>
+<#else>
+    <div>You do not have permission to use this page (ENTITY_MAINT needed)</div>
+</#if>
+<#else>
+<#macro displayButtonBar>
+  <div class="button-bar">
+    <input type="submit" value="${uiLabelMap.WebtoolsExport}"/>
+    <a href="<@ofbizUrl>xmldsdump?checkAll=true</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsCheckAll}</a>
+    <a href="<@ofbizUrl>xmldsdump</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsUnCheckAll}</a>
+  </div>
+</#macro>
+
+<div class="page-title"><span>${uiLabelMap.PageTitleEntityExport}</span></div>
+<p>${uiLabelMap.WebtoolsXMLExportInfo}</p>
+<hr />
+
+<#if security.hasPermission("ENTITY_MAINT", session)>
+  <h2>${uiLabelMap.WebtoolsResults}:</h2>
+  <#if parameters.filename?has_content && (numberOfEntities?number > 0)>
+    <p>${uiLabelMap.WebtoolsWroteXMLForAllDataIn}</p>
+    <p>${uiLabelMap.WebtoolsWroteNRecordsToXMLFile}</p>
+  <#elseif parameters.outpath?has_content && (numberOfEntities?number > 0)>
+    <#list results as result>
+      <p>${result}</p>
+    </#list>
+  <#else>
+    <p>${uiLabelMap.WebtoolsNoFilenameSpecified}</p>
+  </#if>
+
+  <hr />
+
+  <h2>${uiLabelMap.WebtoolsExport}:</h2>
+  <form method="post" action="<@ofbizUrl>xmldsdump</@ofbizUrl>" name="entityExport">
+    <table class="basic-table">
+      <tr>
+        <td class="label">${uiLabelMap.WebtoolsOutputDirectory}</td>
+        <td><input type="text" size="60" name="outpath" value="${parameters.outpath!}"/></td>
+      </tr>
+      <tr>
+        <td class="label">${uiLabelMap.WebtoolsMaxRecordsPerFile}</td>
+        <td><input type="text" size="10" name="maxrecords"/></td>
+      </tr>
+      <tr>
+        <td class="label">${uiLabelMap.WebtoolsSingleFilename}</td>
+        <td><input type="text" size="60" name="filename" value="${parameters.filename!}"/></td>
+      </tr>
+      <tr>
+        <td class="label">${uiLabelMap.WebtoolsRecordsUpdatedSince}</td>
+        <td>
+        <@htmlTemplate.renderDateTimeField name="entityFrom" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="entityFrom1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+        </td>
+      </tr>
+      <tr>
+        <td class="label">${uiLabelMap.WebtoolsRecordsUpdatedBefore} </td>
+        <td>
+            <@htmlTemplate.renderDateTimeField name="entityThru" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="entityThru1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+        </td>
+      </tr>
+      <tr>
+        <td class="label">${StringUtil.wrapString(uiLabelMap.WebtoolsOutToBrowser)}</td>
+        <td><input type="checkbox" name="tobrowser"<#if tobrowser?has_content> checked="checked"</#if> /></td>
+      </tr>
+    </table>
+    <br />
+    <p>${uiLabelMap.WebtoolsEntityNames}:</p>
+    <@displayButtonBar/>
+      <div>${uiLabelMap.WebtoolsEntitySyncDump}:
+        <input name="entitySyncId" size="30" value="${entitySyncId!}"/>
+      </div>
+      ${uiLabelMap.WebtoolsPreConfiguredSet}:
+      <select name="preConfiguredSetName">
+        <option value="">${uiLabelMap.CommonNone}</option>
+        <option value="CatalogExport">${uiLabelMap.WebtoolsPreConfiguredSet1}</option>
+        <option value="Product1">${uiLabelMap.WebtoolsPreConfiguredSet2}</option>
+        <option value="Product2">${uiLabelMap.WebtoolsPreConfiguredSet3}</option>
+        <option value="Product3">${uiLabelMap.WebtoolsPreConfiguredSet4}</option>
+        <option value="Product4">${uiLabelMap.WebtoolsPreConfiguredSet5}</option>
+      </select>
+      <br />
+
+      <table>
+        <tr>
+          <#assign entCount = 0>
+          <#assign checkAll = parameters.checkAll?default("false")>
+          <#list modelEntities as modelEntity>
+            <#if entCount % 3 == 0 && entCount != 0>
+              </tr><tr>
+            </#if>
+            <#assign entCount = entCount + 1>
+            <#assign check = checkAll/>
+            <#if checkAll == "true" && modelEntity.getClass().getName() == "org.ofbiz.entity.model.ModelViewEntity">
+                <#assign check = "false"/>
+            </#if>
+            <#assign curEntityName = modelEntity.getEntityName()/>
+            <td><input type="checkbox" name="entityName" value="${curEntityName}"<#if check="true"> checked="checked"</#if>/>${curEntityName}</td>
+          </#list>
+        </tr>
+      </table>
+
+      <@displayButtonBar/>
+    </form>
+<#else>
+    <div>${uiLabelMap.WebtoolsPermissionMaint}</div>
+</#if>
+</#if>
\ No newline at end of file
Index: framework/webtools/template/entity/xmldsrawdump.jsp
===================================================================
--- framework/webtools/template/entity/xmldsrawdump.jsp	(revision 0)
+++ framework/webtools/template/entity/xmldsrawdump.jsp	(revision 0)
@@ -0,0 +1,95 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+--%><%@ page import="java.io.*, java.util.*, java.net.*, org.w3c.dom.*, org.ofbiz.security.*, org.ofbiz.entity.*, org.ofbiz.entity.condition.*, org.ofbiz.entity.util.*, org.ofbiz.base.util.*, org.ofbiz.entity.model.*, org.ofbiz.entity.transaction.*" %><jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /><jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" /><%
+  if(security.hasPermission("ENTITY_MAINT", session)) {
+      TreeSet passedEntityNames = (TreeSet) session.getAttribute("xmlrawdump_entitylist");
+      session.removeAttribute("xmlrawdump_entitylist");
+      EntityExpr entityDateCond = (EntityExpr) session.getAttribute("entityDateCond");
+      session.removeAttribute("entityDateCond");
+      if (passedEntityNames != null) {
+
+          ModelReader reader = delegator.getModelReader();
+          Collection ec = reader.getEntityNames();
+          TreeSet entityNames = new TreeSet(ec);
+
+          int numberOfEntities = 0;
+          long numberWritten = 0;
+
+          response.setContentType("text/xml; charset=UTF-8");
+          //UtilXml.writeXmlDocument(, document);
+
+          if(passedEntityNames.size() > 0) {
+            numberOfEntities = passedEntityNames.size();
+
+            PrintWriter writer = null;
+            ServletContext context = pageContext.getServletContext();
+            writer = response.getWriter();
+
+            writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+            writer.println("<entity-engine-xml>");
+
+            boolean beganTransaction = false;
+            try {
+                beganTransaction = TransactionUtil.begin();
+
+                Iterator i = passedEntityNames.iterator();
+                while(i.hasNext()) {
+                    String curEntityName = (String)i.next();
+
+                    ModelEntity me = reader.getModelEntity(curEntityName);
+                    EntityListIterator values = null;
+                    if (me.getNoAutoStamp() == true) {
+                        values = delegator.find(curEntityName, null, null, null, null, null);
+                    } else {
+                        values = delegator.find(curEntityName, entityDateCond, null, null, null, null);
+                    }
+
+                    GenericValue value = null;
+                    while ((value = (GenericValue) values.next()) != null) {
+                        value.writeXmlText(writer, "");
+                        numberWritten++;
+                    }
+                    values.close();
+                }
+                TransactionUtil.commit(beganTransaction);
+            } catch (GenericEntityException e) {
+                String errMsg = "Failure in operation, rolling back transaction";
+                String module = "xmldsrawdump.jsp";
+                Debug.logError(e, errMsg, module);
+                try {
+                    // only rollback the transaction if we started one...
+                    TransactionUtil.rollback(beganTransaction, errMsg, e);
+                } catch (GenericEntityException e2) {
+                    Debug.logError(e2, "Could not rollback transaction: " + e2.toString(), module);
+                }
+                // after rolling back, rethrow the exception
+                throw e;
+            } finally {
+                // only commit the transaction if we started one... this will throw an exception if it fails
+                TransactionUtil.commit(beganTransaction);
+            }
+
+            writer.println("</entity-engine-xml>");
+          }
+
+      } else {%>
+ERROR: No entityName list was found in the session, go back to the export page and try again.
+    <%}%>
+<%} else {%>
+  ERROR: You do not have permission to use this page (ENTITY_MAINT needed)
+<%}%>
Index: framework/webtools/template/geo/GeoLocation.ftl
===================================================================
--- framework/webtools/template/geo/GeoLocation.ftl	(revision 0)
+++ framework/webtools/template/geo/GeoLocation.ftl	(revision 0)
@@ -0,0 +1,25 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#include "component://common/webcommon/includes/GoogleGeoLocation.ftl"/>
+
+<body onload="load()">
+    <center>
+        <div id="map" style="border:1px solid #979797; background-color:#e5e3df; width:500px; height:450px; margin:2em auto;"></div>
+    </center>
+</body>
Index: framework/webtools/template/labelmanager/SearchLabels.ftl
===================================================================
--- framework/webtools/template/labelmanager/SearchLabels.ftl	(revision 0)
+++ framework/webtools/template/labelmanager/SearchLabels.ftl	(revision 0)
@@ -0,0 +1,106 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div class="screenlet-body">
+  <form action="<@ofbizUrl>SearchLabels</@ofbizUrl>" method="post">
+    <table class="basic-table">
+      <tr><td colspan="4">${uiLabelMap.WebtoolsLabelManagerTemporarySearchTitle}</td></tr>    
+      <tr>
+        <td class="label">
+          ${uiLabelMap.WebtoolsLabelManagerKey}
+        </td>
+        <td>
+          <input type="text" name="labelKey" size="30" maxlength="70" value="${parameters.labelKey!}" />
+        </td>
+        <td class="label">
+          ${uiLabelMap.WebtoolsLabelManagerComponentName}
+        </td>
+        <td>
+          <select name="labelComponentName">
+            <option value="">${uiLabelMap.WebtoolsLabelManagerAllComponents}</option>
+            <#list componentNamesFound as componentNameFound>
+              <option <#if parameters.labelComponentName?? && parameters.labelComponentName == componentNameFound>selected="selected"</#if> value="${componentNameFound}">${componentNameFound}</option>
+            </#list>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td class="label">
+          ${uiLabelMap.WebtoolsLabelManagerFileName}
+        </td>
+        <td>
+          <select name="labelFileName">
+            <option value="">${uiLabelMap.WebtoolsLabelManagerAllFiles}</option>
+            <#list filesFound as fileInfo>
+              <#assign fileName = fileInfo.getFileName()/>
+              <option <#if parameters.labelFileName?? && parameters.labelFileName == fileName>selected="selected"</#if> value="${fileName}">${fileName}</option>
+            </#list>
+          </select>
+        </td>
+        <td class="label">
+          ${uiLabelMap.WebtoolsLabelManagerLocale}
+        </td>
+        <td>
+          <select name="labelLocaleName">
+            <option value="">${uiLabelMap.WebtoolsLabelManagerAllLocales}</option>
+            <#list localesFound as localeFound>
+              <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)!/>
+              <#assign langAttr = localeFound.toString()?replace("_", "-")>
+              <#assign langDir = "ltr">
+              <#if 1 < langAttr?length>
+                <#if "ar.iw"?contains(langAttr?substring(0, 2))>
+                  <#assign langDir = "rtl">
+                </#if>
+              </#if>
+              <option <#if parameters.labelLocaleName?? && parameters.labelLocaleName == localeFound>selected="selected"</#if> value="${localeFound}" lang="${langAttr}" dir="${langDir}"><#if locale?? && locale?has_content>${locale.getDisplayName(locale)}<#else>${localeFound}</#if></option>
+            </#list>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td class="label">
+          ${uiLabelMap.WebtoolsLabelManagerOnlyNotUsedLabels}
+        </td>
+        <td>
+          <input type="checkbox" name="onlyNotUsedLabels" value="Y" <#if parameters.onlyNotUsedLabels?? && parameters.onlyNotUsedLabels == "Y">checked="checked"</#if> />
+        </td>
+        <td class="label">
+          ${uiLabelMap.WebtoolsLabelManagerOnlyMissingTranslations}
+        </td>
+        <td>
+          <input type="checkbox" name="onlyMissingTranslations" value="Y" <#if parameters.onlyMissingTranslations?? && parameters.onlyMissingTranslations == "Y">checked="checked"</#if> />
+        </td>
+      </tr>
+      <tr>
+        <td colspan="4" align="center">
+          <#if (duplicatedLocalesLabels > 0)>
+            <br />
+            <b>${uiLabelMap.WebtoolsLabelManagerWarningMessage} (${duplicatedLocalesLabels})</b>
+            <br />
+            <#list duplicatedLocalesLabelsList as duplicatedLocalesLabel>
+                <br/>${duplicatedLocalesLabel.labelKey}
+            </#list>
+            <br /><br />${uiLabelMap.WebtoolsLabelManagerClearCacheAfterFixingDuplicateLabels}
+          <#else>
+            <input type="submit" name="searchLabels" value="${uiLabelMap.CommonFind}"/>
+          </#if>
+        </td>
+      </tr>
+    </table>
+  </form>
+</div>
Index: framework/webtools/template/labelmanager/UpdateLabel.ftl
===================================================================
--- framework/webtools/template/labelmanager/UpdateLabel.ftl	(revision 0)
+++ framework/webtools/template/labelmanager/UpdateLabel.ftl	(revision 0)
@@ -0,0 +1,129 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<script language="JavaScript" type="text/javascript">
+    function updateAndSaveLabel() {
+        document.UpdateLabelForm.action="<@ofbizUrl>SaveLabelsToXmlFile</@ofbizUrl>";
+        document.UpdateLabelForm.submit();
+    }
+</script>
+<div class="screenlet-body">
+    <form method="post" action="<@ofbizUrl>SaveLabelsToXmlFile</@ofbizUrl>" name="UpdateLabelForm">
+        <table class="basic-table" cellspacing="3">
+            <tr>
+                <td colspan="2">&nbsp;</td>
+            </tr>
+            <tr>
+                <td class="label">${uiLabelMap.WebtoolsLabelManagerKey}</td>
+                <td>
+                    <#if parameters.sourceKey??>
+                        ${parameters.sourceKey}
+                        <input type="hidden" name="key" value="${parameters.sourceKey}" />
+                        <input type="hidden" name="update_label" value="Y" />
+                    <#else>
+                        <input type="text" name="key" size="70" />
+                        <input type="hidden" name="update_label" value="N" />
+                    </#if>
+                </td>
+            </tr>
+            <tr>
+                <td class="label">${uiLabelMap.WebtoolsLabelManagerKeyComment}</td>
+                <td>
+                    <input type="text" name="keyComment" size="70" value="${parameters.sourceKeyComment!}" />
+                </td>
+            </tr>
+            <tr>
+                <td class="label">${uiLabelMap.WebtoolsLabelManagerFileName}</td>
+                <td>
+                    <#if parameters.sourceFileName??>
+                        ${parameters.sourceFileName}
+                        <input type="hidden" name="fileName" value="${parameters.sourceFileName}" />
+                    <#else>
+                        <select name="fileName">
+                            <#list filesFound as fileInfo>
+                              <#assign fileName = fileInfo.file.getName()/>
+                              <option <#if parameters.fileName?? && parameters.fileName == fileName>selected="selected"</#if> value="${fileName}">${fileName}</option>
+                            </#list>
+                        </select>
+                    </#if>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2" align="center">
+                    <input type="submit" value="${uiLabelMap.CommonBack}"/>
+                    <#if parameters.sourceKey??>
+                        <input type="submit" value="${uiLabelMap.WebtoolsLabelManagerRemove}" name="removeLabel"/>
+                        <input type="submit" value="${uiLabelMap.CommonUpdate}" name="confirm" onclick="javascript:updateAndSaveLabel()"/>
+                    <#else>
+                        <input type="submit" value="${uiLabelMap.CommonAdd}" name="confirm"/>
+                        <input type="submit" value="${uiLabelMap.WebtoolsLabelManagerUpdateAndSave}" name="confirm" onclick="javascript:updateAndSaveLabel()"/>
+                    </#if>
+                </td>
+            </tr>
+            <#list localesFound as localeFound>
+                <#assign labelValue = "">
+                <#assign labelComment = "">
+                <#if parameters.sourceKey??>
+                    <#assign value = (label.getLabelValue(localeFound))!>
+                    <#if value?has_content>
+                        <#assign labelValue = value.getLabelValue()>
+                        <#assign labelComment = value.getLabelComment()>
+                    </#if>
+                </#if>
+                <#assign showLocale = true>
+                <#if parameters.labelLocaleName?? && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound>
+                    <#assign showLocale = false>
+                </#if>
+                <#if showLocale == true>
+                    <tr>
+                        <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)!/>
+                        <#if locale?? && locale?has_content>
+                            <#assign langAttr = localeFound.toString()?replace("_", "-")>
+                            <#assign langDir = "ltr">
+                            <#if "ar.iw"?contains(langAttr?substring(0, 2))>
+                                <#assign langDir = "rtl">
+                            </#if>
+                            <td lang="${langAttr}" dir="${langDir}" class="label">
+                                ${locale.getDisplayName(locale)}
+                            </td>
+                        <#else>
+                            <td class="label">${localeFound}</td>
+                        </#if>
+                        <td>
+                            <input type="hidden" name="localeNames" value="${localeFound}" />
+                            <input type="text" name="localeValues" size="70" value="${labelValue!}" />
+                            <input type="text" name="localeComments" size="70" value="${labelComment!}" />
+                        </td>
+                    </tr>
+                </#if>
+            </#list>
+            <tr>
+                <td colspan="2" align="center">
+                    <input type="submit" value="${uiLabelMap.CommonBack}"/>
+                    <#if parameters.sourceKey??>
+                        <input type="submit" value="${uiLabelMap.WebtoolsLabelManagerRemove}" name="removeLabel"/>
+                        <input type="submit" value="${uiLabelMap.CommonUpdate}" name="confirm" onclick="javascript:updateAndSaveLabel()"/>
+                    <#else>
+                        <input type="submit" value="${uiLabelMap.CommonAdd}" name="confirm"/>
+                        <input type="submit" value="${uiLabelMap.WebtoolsLabelManagerUpdateAndSave}" name="confirm" onclick="javascript:updateAndSaveLabel()"/>
+                    </#if>
+                </td>
+            </tr>
+        </table>
+    </form>
+</div>
Index: framework/webtools/template/labelmanager/ViewFile.ftl
===================================================================
--- framework/webtools/template/labelmanager/ViewFile.ftl	(revision 0)
+++ framework/webtools/template/labelmanager/ViewFile.ftl	(revision 0)
@@ -0,0 +1,36 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div class="screenlet-body">
+    <table class="basic-table" cellspacing="3">
+        <tr>
+            <td class="label">${uiLabelMap.WebtoolsLabelManagerKey}</td>
+            <td>${parameters.sourceKey!}</td>
+        </tr>
+        <tr>
+            <td class="label">${uiLabelMap.WebtoolsLabelManagerFileName}</td>
+            <td>${parameters.fileName!}</td>
+        </tr>
+        <tr>
+            <td colspan="2">&nbsp;</td>
+        </tr>
+    </table>
+    <textarea rows="${rows}}" cols="150" disabled="disabled">
+${fileString}
+    </textarea>
+</div>
Index: framework/webtools/template/labelmanager/ViewHardcodedLabels.ftl
===================================================================
--- framework/webtools/template/labelmanager/ViewHardcodedLabels.ftl	(revision 0)
+++ framework/webtools/template/labelmanager/ViewHardcodedLabels.ftl	(revision 0)
@@ -0,0 +1,48 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div class="screenlet-body">
+  <#if parameters.searchLabels??>
+  <table class="basic-table hover-bar" cellspacing="3">
+    <tr class="header-row">
+      <td>${uiLabelMap.WebtoolsLabelManagerRow}</td>
+      <td>${uiLabelMap.WebtoolsLabelManagerKey}</td>
+      <td>${uiLabelMap.WebtoolsLabelManagerReferences}</td>
+    </tr>
+    <#assign rowNumber = 1>
+    <#assign rowNum = "2">
+    <#list referencesList as reference>
+      <#assign labelFound = 'N'>
+      <#assign refNum = factory.getLabelReferenceFile(reference)>
+      <#if (refNum > 0)>
+        <tr <#if rowNum == "1">class="alternate-row"</#if>>
+          <td>${rowNumber}</td>
+          <td>${reference}</td>
+          <td align="center"><#if (refNum > 0)><a href="<@ofbizUrl>ViewReferences?sourceKey=${reference}</@ofbizUrl>">${refNum}</a><#else>${refNum}</#if></td>
+        </tr>
+        <#assign rowNumber = rowNumber + 1>
+        <#if rowNum == "2">
+          <#assign rowNum = "1">
+        <#else>
+          <#assign rowNum = "2">
+        </#if>
+      </#if>
+    </#list>
+  </table>
+  </#if>
+</div>
Index: framework/webtools/template/labelmanager/ViewLabels.ftl
===================================================================
--- framework/webtools/template/labelmanager/ViewLabels.ftl	(revision 0)
+++ framework/webtools/template/labelmanager/ViewLabels.ftl	(revision 0)
@@ -0,0 +1,132 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div class="screenlet-body">
+  <table class="basic-table hover-bar" cellspacing="3">
+    <tr class="header-row">
+      <td>${uiLabelMap.WebtoolsLabelManagerRow}</td>
+      <td>${uiLabelMap.WebtoolsLabelManagerKey}</td>
+      <td>${uiLabelMap.WebtoolsLabelManagerFileName}</td>
+      <td>${uiLabelMap.WebtoolsLabelManagerReferences}</td>
+      <#list localesFound as localeFound>
+        <#assign showLocale = true>
+        <#if parameters.labelLocaleName?? && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound>
+          <#assign showLocale = false>
+        </#if>
+        <#if showLocale == true>
+          <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)!/>
+          <#if locale?? && locale?has_content>
+            <#assign langAttr = localeFound.toString()?replace("_", "-")>
+            <#assign langDir = "ltr">
+            <#if "ar.iw"?contains(langAttr?substring(0, 2))>
+              <#assign langDir = "rtl">
+            </#if>
+            <td lang="${langAttr}" dir="${langDir}">
+              ${locale.getDisplayName(locale)}
+            </td>
+          <#else>
+            <td>${localeFound}</td>
+          </#if>
+        </#if>
+      </#list>
+    </tr>
+    <#if parameters.searchLabels??>
+      <#assign rowNum = "2">
+      <#assign rowNumber = 1>
+      <#assign totalLabels = 0>
+      <#assign missingLabels = 0>
+      <#assign existingLabels = 0>
+      <#assign previousKey = "">
+      <#list labelsList as labelList>
+        <#assign label = labels.get(labelList)>
+        <#assign labelKey = label.labelKey>
+        <#assign totalLabels = totalLabels + 1>
+        <#if references??>
+          <#assign referenceNum = 0>
+          <#assign reference = references.get(labelKey)!>
+          <#if reference?? && reference?has_content>
+            <#assign referenceNum = reference.size()>
+          </#if>
+        </#if>
+        <#assign showLabel = true>
+        <#if parameters.onlyMissingTranslations?? && parameters.onlyMissingTranslations == "Y" 
+            && parameters.labelLocaleName?? && parameters.labelLocaleName != "">
+          <#assign labelValue = label.getLabelValue(parameters.labelLocaleName)!>
+          <#if labelValue?? && labelValue?has_content>
+            <#assign value = labelValue.getLabelValue()!>
+            <#if value?? && value?has_content>
+              <#assign showLabel = false>
+            </#if>
+          </#if>
+        </#if>
+        <#if showLabel && parameters.onlyNotUsedLabels?? && parameters.onlyNotUsedLabels == "Y" && (referenceNum > 0)>
+            <#assign showLabel = false>
+        </#if>
+        <#if showLabel && parameters.labelKey?? && parameters.labelKey != "" && parameters.labelKey != label.labelKey>
+          <#assign showLabel = false>
+        </#if>
+        <#if showLabel && parameters.labelFileName?? && parameters.labelFileName != "" && parameters.labelFileName != label.fileName>
+          <#assign showLabel = false>
+        </#if>
+        <#if showLabel == true>
+          <tr <#if rowNum == "1">class="alternate-row"</#if>>
+            <td>${rowNumber}</td>
+            <td><a href="<@ofbizUrl>UpdateLabel?sourceKey=${labelKey}&amp;sourceFileName=${label.fileName}&amp;sourceKeyComment=${label.labelKeyComment!}</@ofbizUrl>" <#if previousKey == labelKey>class="submenutext"</#if>>${label.labelKey}</a></td>
+            <td>${label.fileName}</td>
+            <td><a href="<@ofbizUrl>ViewReferences?sourceKey=${labelKey}&amp;labelFileName=${label.fileName}</@ofbizUrl>">${uiLabelMap.WebtoolsLabelManagerReferences}</a></td>
+            <#list localesFound as localeFound>
+              <#assign labelVal = label.getLabelValue(localeFound)!>
+              <#assign showLocale = true>
+              <#if parameters.labelLocaleName?? && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound>
+                <#assign showLocale = false>
+              </#if>
+              <#if showLocale>
+                <#if labelVal?has_content>
+                  <td>${labelVal.getLabelValue()}</td>
+                  <#assign existingLabels = existingLabels + 1>
+                <#else>
+                  <td>&nbsp;</td>
+                  <#assign missingLabels = missingLabels + 1>
+                </#if>
+              </#if>
+            </#list>
+          </tr>
+          <#if rowNum == "2">
+            <#assign rowNum = "1">
+          <#else>
+            <#assign rowNum = "2">
+          </#if>
+          <#assign previousKey = labelKey>
+          <#assign rowNumber = rowNumber + 1>
+        </#if>
+      </#list>
+      <tr class="header-row">
+        <td/>
+        <td>${uiLabelMap.WebtoolsLabelStatsTotal}: ${totalLabels}</td>
+        <td colspan="2">
+          ${uiLabelMap.WebtoolsLabelStatsExist}:<br />
+          ${uiLabelMap.WebtoolsLabelStatsMissing}:
+        </td>
+        <td>
+          ${existingLabels}<br />
+          ${missingLabels}
+        </td>
+      </tr>
+    </#if>
+  </table>
+</div>
Index: framework/webtools/template/labelmanager/ViewReferences.ftl
===================================================================
--- framework/webtools/template/labelmanager/ViewReferences.ftl	(revision 0)
+++ framework/webtools/template/labelmanager/ViewReferences.ftl	(revision 0)
@@ -0,0 +1,61 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<h1>${uiLabelMap.WebtoolsLabelManagerViewReferences}</h1>
+        <table class="basic-table" cellspacing="0">
+            <tr>
+                <td class="label">${uiLabelMap.WebtoolsLabelManagerKey}</td>
+                <td colspan="2">${parameters.sourceKey!}</td>
+            </tr>
+            <tr>
+                <td colspan="3">&nbsp;</td>
+            </tr>
+            <tr class="header-row">
+                <td>${uiLabelMap.WebtoolsLabelManagerRow}</td>
+                <td>${uiLabelMap.WebtoolsLabelManagerFileName}</td>
+                <td>${uiLabelMap.WebtoolsLabelManagerReferences}</td>
+            </tr>
+            <#if parameters.sourceKey?? && parameters.sourceKey?has_content>
+              <#assign rowNum = "2">
+              <#assign rowNumber = 1>
+              <#assign totalRefs = 0/>
+              <#assign reference = references.get(parameters.sourceKey)!>
+              <#if reference?? &&  reference?has_content>
+                <#assign entries = reference.entrySet()>
+                <#list entries as entry>
+                  <tr <#if rowNum == "1">class="alternate-row"</#if>>
+                    <td>${rowNumber}</td>
+                    <td><a href="<@ofbizUrl>ViewFile?fileName=${entry.getKey()}&amp;sourceKey=${parameters.sourceKey!}</@ofbizUrl>">${entry.getKey()}</a></td>
+                    <td>${entry.getValue()}</td>
+                  </tr>
+                  <#assign totalRefs = totalRefs + entry.getValue()/>
+                <#if rowNum == "2">
+                  <#assign rowNum = "1">
+                <#else>
+                  <#assign rowNum = "2">
+                </#if>
+                <#assign rowNumber = rowNumber + 1>
+                </#list>
+                  <tr <#if rowNum == "1">class="alternate-row"</#if>>
+                    <td>&nbsp;</td>
+                    <td><b>${uiLabelMap.CommonTotal}</b></td>
+                    <td>${totalRefs}</td>
+                  </tr>
+              </#if>
+            </#if>
+        </table>
Index: framework/webtools/template/log/logContent.ftl
===================================================================
--- framework/webtools/template/log/logContent.ftl	(revision 0)
+++ framework/webtools/template/log/logContent.ftl	(revision 0)
@@ -0,0 +1,22 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#list logLines as logLine>
+  <div class="${logLine.type}">${logLine.line}</div>
+</#list>
Index: framework/webtools/template/main.ftl
===================================================================
--- framework/webtools/template/main.ftl	(revision 0)
+++ framework/webtools/template/main.ftl	(revision 0)
@@ -0,0 +1,120 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <li class="h3">${uiLabelMap.WebtoolsMainPage}</li>
+      <li class="disabled">${delegator.getDelegatorName()}</li>
+    </ul>
+    <br class="clear"/>
+  </div>
+  <div class="screenlet-body">
+    <#if !userLogin?has_content>
+      <div>${uiLabelMap.WebtoolsForSomethingInteresting}.</div>
+      <br />
+      <div>${uiLabelMap.WebtoolsNoteAntRunInstall}</div>
+      <br />
+      <div><a href="<@ofbizUrl>checkLogin</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></div>
+    </#if>
+    <#if userLogin?has_content>
+      <ul class="webToolList">
+        <li><h3>${uiLabelMap.WebtoolsCacheDebugTools}</h3></li>
+        <li><a href="<@ofbizUrl>FindUtilCache</@ofbizUrl>">${uiLabelMap.WebtoolsCacheMaintenance}</a></li>
+        <li><a href="<@ofbizUrl>LogConfiguration</@ofbizUrl>">${uiLabelMap.WebtoolsAdjustDebuggingLevels}</a></li>
+        <li><a href="<@ofbizUrl>LogView</@ofbizUrl>">${uiLabelMap.WebtoolsViewLog}</a></li>
+        <li><a href="<@ofbizUrl>ViewComponents</@ofbizUrl>">${uiLabelMap.WebtoolsViewComponents}</a></li>
+        <#if security.hasPermission("ARTIFACT_INFO_VIEW", session)>
+          <li><h3>${uiLabelMap.WebtoolsGeneralArtifactInfoTools}</h3></li>
+          <li><a href="<@ofbizUrl>ViewComponents</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsArtifactInfo}</a></li>
+          <li><a href="<@ofbizUrl>entityref</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsEntityReference} - ${uiLabelMap.WebtoolsEntityReferenceInteractiveVersion}</a></li>
+          <li><a href="<@ofbizUrl>ServiceList</@ofbizUrl>">${uiLabelMap.WebtoolsServiceReference}</a></li>
+        </#if>
+        <#if security.hasPermission("LABEL_MANAGER_VIEW", session)>
+          <li><h3>${uiLabelMap.WebtoolsLabelManager}</h3></li>
+          <li><a href="<@ofbizUrl>SearchLabels</@ofbizUrl>">${uiLabelMap.WebtoolsLabelManager}</a></li>
+        </#if>
+        <#if security.hasPermission("ENTITY_MAINT", session)>
+          <li><h3>${uiLabelMap.WebtoolsEntityEngineTools}</h3></li>
+          <li><a href="<@ofbizUrl>entitymaint</@ofbizUrl>">${uiLabelMap.WebtoolsEntityDataMaintenance}</a></li>
+          <li><a href="<@ofbizUrl>entityref</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsEntityReference} - ${uiLabelMap.WebtoolsEntityReferenceInteractiveVersion}</a></li>
+          <li><a href="<@ofbizUrl>entityref?forstatic=true</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsEntityReference} - ${uiLabelMap.WebtoolsEntityReferenceStaticVersion}</a></li>
+          <li><a href="<@ofbizUrl>entityrefReport</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsEntityReferencePdf}</a></li>
+          <li><a href="<@ofbizUrl>EntitySQLProcessor</@ofbizUrl>">${uiLabelMap.PageTitleEntitySQLProcessor}</a></li>
+          <li><a href="<@ofbizUrl>EntitySyncStatus</@ofbizUrl>">${uiLabelMap.WebtoolsEntitySyncStatus}</a></li>
+          <li><a href="<@ofbizUrl>view/ModelInduceFromDb</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsInduceModelXMLFromDatabase}</a></li>
+          <li><a href="<@ofbizUrl>EntityEoModelBundle</@ofbizUrl>">${uiLabelMap.WebtoolsExportEntityEoModelBundle}</a></li>
+          <li><a href="<@ofbizUrl>view/checkdb</@ofbizUrl>">${uiLabelMap.WebtoolsCheckUpdateDatabase}</a></li>
+          <li><a href="<@ofbizUrl>ConnectionPoolStatus</@ofbizUrl>">${uiLabelMap.ConnectionPoolStatus}</a></li>
+          <#-- want to leave these out because they are only working so-so, and cause people more problems that they solve, IMHO
+            <li><a href="<@ofbizUrl>view/EditEntity</@ofbizUrl>"  target="_blank">Edit Entity Definitions</a></li>
+            <li><a href="<@ofbizUrl>ModelWriter</@ofbizUrl>" target="_blank">Generate Entity Model XML (all in one)</a></li>
+            <li><a href="<@ofbizUrl>ModelWriter?savetofile=true</@ofbizUrl>" target="_blank">Save Entity Model XML to Files</a></li>
+          -->
+          <#-- not working right now anyway
+            <li><a href="<@ofbizUrl>ModelGroupWriter</@ofbizUrl>" target="_blank">Generate Entity Group XML</a></li>
+            <li><a href="<@ofbizUrl>ModelGroupWriter?savetofile=true</@ofbizUrl>" target="_blank">Save Entity Group XML to File</a></li>
+          -->
+          <#--
+            <li><a href="<@ofbizUrl>view/tablesMySql</@ofbizUrl>">MySQL Table Creation SQL</a></li>
+            <li><a href="<@ofbizUrl>view/dataMySql</@ofbizUrl>">MySQL Auto Data SQL</a></li>
+          -->
+          <li><h3>${uiLabelMap.WebtoolsEntityXMLTools}</h3></li>
+          <li><a href="<@ofbizUrl>xmldsdump</@ofbizUrl>">${uiLabelMap.PageTitleEntityExport}</a></li>
+          <li><a href="<@ofbizUrl>EntityExportAll</@ofbizUrl>">${uiLabelMap.PageTitleEntityExportAll}</a></li>
+          <li><a href="<@ofbizUrl>EntityImport</@ofbizUrl>">${uiLabelMap.PageTitleEntityImport}</a></li>
+          <li><a href="<@ofbizUrl>EntityImportDir</@ofbizUrl>">${uiLabelMap.PageTitleEntityImportDir}</a></li>
+          <li><a href="<@ofbizUrl>EntityImportReaders</@ofbizUrl>">${uiLabelMap.PageTitleEntityImportReaders}</a></li>
+        </#if>
+        <#if security.hasPermission("SERVICE_MAINT", session)>
+          <li><h3>${uiLabelMap.WebtoolsServiceEngineTools}</h3></li>
+          <li><a href="<@ofbizUrl>ServiceList</@ofbizUrl>">${uiLabelMap.WebtoolsServiceReference}</a></li>
+          <li><a href="<@ofbizUrl>scheduleJob</@ofbizUrl>">${uiLabelMap.PageTitleScheduleJob}</a></li>
+          <li><a href="<@ofbizUrl>runService</@ofbizUrl>">${uiLabelMap.PageTitleRunService}</a></li>
+          <li><a href="<@ofbizUrl>FindJob</@ofbizUrl>">${uiLabelMap.PageTitleJobList}</a></li>
+          <li><a href="<@ofbizUrl>threadList</@ofbizUrl>">${uiLabelMap.PageTitleThreadList}</a></li>
+          <li><a href="<@ofbizUrl>FindJobManagerLock</@ofbizUrl>">${uiLabelMap.PageTitleJobManagerLockList}</a></li>
+          <li><a href="<@ofbizUrl>ServiceLog</@ofbizUrl>">${uiLabelMap.WebtoolsServiceLog}</a></li>
+        </#if>
+        <#if security.hasPermission("DATAFILE_MAINT", session)>
+          <li><h3>${uiLabelMap.WebtoolsDataFileTools}</h3></li>
+          <li><a href="<@ofbizUrl>viewdatafile</@ofbizUrl>">${uiLabelMap.WebtoolsWorkWithDataFiles}</a></li>
+        </#if>
+        <li><h3>${uiLabelMap.WebtoolsMiscSetupTools}</h3></li>
+        <#if security.hasPermission("PORTALPAGE_ADMIN", session)>
+          <li><a href="<@ofbizUrl>FindGeo</@ofbizUrl>">${uiLabelMap.WebtoolsGeoManagement}</a></li>
+          <li><a href="<@ofbizUrl>WebtoolsLayoutDemo</@ofbizUrl>">${uiLabelMap.WebtoolsLayoutDemo}</a></li>
+        </#if>
+        <#if security.hasPermission("ENUM_STATUS_MAINT", session)>
+          <#--
+          <li><a href="<@ofbizUrl>EditEnumerationTypes</@ofbizUrl>">Edit Enumerations</a></li>
+          <li><a href="<@ofbizUrl>EditStatusTypes</@ofbizUrl>">Edit Status Options</a></li>
+          -->
+        </#if>
+        <li><h3>${uiLabelMap.WebtoolsPerformanceTests}</h3></li>
+        <li><a href="<@ofbizUrl>EntityPerformanceTest</@ofbizUrl>">${uiLabelMap.WebtoolsEntityEngine}</a></li>
+        <#if security.hasPermission("SERVER_STATS_VIEW", session)>
+          <li><h3>${uiLabelMap.WebtoolsServerHitStatisticsTools}</h3></li>
+          <li><a href="<@ofbizUrl>StatsSinceStart</@ofbizUrl>">${uiLabelMap.WebtoolsStatsSinceServerStart}</a></li>
+        </#if>
+        <li><h3>${uiLabelMap.WebtoolsCertsX509}</h3></li>
+        <li><a href="<@ofbizUrl>myCertificates</@ofbizUrl>">${uiLabelMap.WebtoolsMyCertificates}</a></li>
+      </ul>
+    </#if>
+  </div>
+</div>
Index: framework/webtools/template/ping.ftl
===================================================================
--- framework/webtools/template/ping.ftl	(revision 0)
+++ framework/webtools/template/ping.ftl	(revision 0)
@@ -0,0 +1,21 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+${requestAttributes._ERROR_MESSAGE_!}
+${requestAttributes.message!}
\ No newline at end of file
Index: framework/webtools/template/ping.txt
===================================================================
--- framework/webtools/template/ping.txt	(revision 0)
+++ framework/webtools/template/ping.txt	(revision 0)
@@ -0,0 +1 @@
+pong
\ No newline at end of file
Index: framework/webtools/template/service/availableservices.ftl
===================================================================
--- framework/webtools/template/service/availableservices.ftl	(revision 0)
+++ framework/webtools/template/service/availableservices.ftl	(revision 0)
@@ -0,0 +1,378 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#--Dispatcher Name: ${dispatcherName?default(uiLabelMap.CommonNA)} -->
+
+<#assign url='ServiceList'>
+<#assign popupUrl='serviceEcaDetail'>
+
+<#-- Selected Service is available -->
+<#if selectedServiceMap??>
+  <#if showWsdl?? && showWsdl = true>
+    <div class="screenlet">
+      <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.WebtoolsServiceWSDL} - ${uiLabelMap.WebtoolsService} ${selectedServiceMap.serviceName}</h3>
+      </div>
+      <div class="screenlet-body" align="center">
+        <form><textarea rows="20" cols="85" name="wsdloutput">${selectedServiceMap.wsdl}</textarea></form>
+        <br />
+        <a href='<@ofbizUrl>${url}?sel_service_name=${selectedServiceMap.serviceName}</@ofbizUrl>' class='smallSubmit'>${uiLabelMap.CommonBack}</a>
+      </div>
+    </div>
+  <#else>
+    <div class="screenlet">
+      <div class="screenlet-title-bar">
+        <ul>
+          <li class="h3">${uiLabelMap.WebtoolsService} ${selectedServiceMap.serviceName}</li>
+          <li><a href='<@ofbizUrl>${url}</@ofbizUrl>'>${uiLabelMap.CommonListAll}</a></li>
+          <li><a href='<@ofbizUrl>/scheduleJob?SERVICE_NAME=${selectedServiceMap.serviceName}</@ofbizUrl>'>${uiLabelMap.WebtoolsSchedule}</a></li>
+          <li><a href='<@ofbizUrl>/setSyncServiceParameters?SERVICE_NAME=${selectedServiceMap.serviceName}&amp;POOL_NAME=pool&amp;_RUN_SYNC_=Y</@ofbizUrl>'>${uiLabelMap.PageTitleRunService}</a></li>
+        </ul>
+        <br class="clear"/>
+      </div>
+      <div class="screenlet-body">
+        <table class="basic-table" cellspacing='0'>
+          <tr>
+            <td class="label">${uiLabelMap.WebtoolsServiceName}</td>
+            <td>${selectedServiceMap.serviceName}</td>
+            <td class="label">${uiLabelMap.WebtoolsEngineName}</td>
+            <td><a href='<@ofbizUrl>${url}?constraint=engine_name@${selectedServiceMap.engineName}</@ofbizUrl>'>${selectedServiceMap.engineName}</a></td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.CommonDescription}</td>
+            <td>${selectedServiceMap.description}</td>
+            <td class="label">${uiLabelMap.WebtoolsInvoke}</td>
+            <td>${selectedServiceMap.invoke}</td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.WebtoolsExportable}</td>
+            <td>${selectedServiceMap.export}<#if selectedServiceMap.exportBool = "true">&nbsp;(<a href='<@ofbizUrl>${url}?sel_service_name=${selectedServiceMap.serviceName}&amp;show_wsdl=true</@ofbizUrl>'>${uiLabelMap.WebtoolsShowShowWSDL}</a>)</#if></td>
+            <td class="label">${uiLabelMap.WebtoolsLocation}</td>
+            <td><a href='<@ofbizUrl>${url}?constraint=location@${selectedServiceMap.location}</@ofbizUrl>'>${selectedServiceMap.location}</a></td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.WebtoolsDefinitionLocation}</td>
+            <td><a href='<@ofbizUrl>${url}?constraint=definitionLocation@${selectedServiceMap.definitionLocation}</@ofbizUrl>'>${selectedServiceMap.definitionLocation}</a></td>
+            <td class="label">${uiLabelMap.WebtoolsDefaultEntityName}</td>
+            <td><a href='<@ofbizUrl>${url}?constraint=default_entity_name@${selectedServiceMap.defaultEntityName}</@ofbizUrl>'>${selectedServiceMap.defaultEntityName}</a></td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.WebtoolsArtifactInfo}</td>
+            <td><a href='<@ofbizUrl>ArtifactInfo?name=${selectedServiceMap.serviceName}&amp;type=service</@ofbizUrl>'>${uiLabelMap.WebtoolsArtifactInfo}</a></td>
+            <td class="label">${uiLabelMap.WebtoolsRequireNewTransaction}</td>
+            <td>${selectedServiceMap.requireNewTransaction}</td>
+          </tr>
+          <tr>
+            <td colspan="2">&nbsp;</td>
+            <td class="label">${uiLabelMap.WebtoolsUseTransaction}</td>
+            <td>${selectedServiceMap.useTrans}</td>
+          </tr>
+          <tr>
+            <td colspan="2">&nbsp;</td>
+            <td class="label">${uiLabelMap.WebtoolsMaxRetries}</td>
+            <td>${selectedServiceMap.maxRetry}</td>
+          </tr>
+        </table>
+      </div>
+    </div>
+
+    <div class="screenlet">
+      <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.SecurityGroups}</h3>
+      </div>
+      <#if selectedServiceMap.permissionGroups != 'NA'>
+        <table class="basic-table" cellspacing='0'>
+          <tr class="header-row">
+            <td>${uiLabelMap.WebtoolsNameOrRole}</td>
+            <td>${uiLabelMap.WebtoolsPermissionType}</td>
+            <td>${uiLabelMap.WebtoolsAction}</td>
+          </tr>
+          <#list selectedServiceMap.permissionGroups as permGrp>
+            <tr>
+              <td>${permGrp.nameOrRole?default(uiLabelMap.CommonNA)}</td>
+              <td>${permGrp.permType?default(uiLabelMap.CommonNA)}</td>
+              <td>${permGrp.action?default(uiLabelMap.CommonNA)}</td>
+            </tr>
+          </#list>
+        </table>
+      <#else>
+        <div class="screenlet-body">
+          <b>${selectedServiceMap.permissionGroups}</b>
+        </div>
+      </#if>
+    </div>
+
+    <div class="screenlet">
+      <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.WebtoolsImplementedServices}</h3>
+      </div>
+      <div class="screenlet-body">
+        <#if selectedServiceMap.implServices == 'NA'>
+          <b>${selectedServiceMap.implServices}</b>
+        <#elseif selectedServiceMap.implServices?has_content>
+          <#list selectedServiceMap.implServices as implSrv>
+            <a href='<@ofbizUrl>${url}?sel_service_name=${implSrv.getService()}</@ofbizUrl>'>${implSrv.getService()}</a><br />
+          </#list>
+        </#if>
+      </div>
+    </div>
+
+    <#-- If service has ECA's -->
+    <#if ecaMapList?? && ecaMapList?has_content>
+      <#-- add the javascript for modalpopup's -->
+      <script language='javascript' type='text/javascript'>
+          function detailsPopup(viewName){
+              var lookupWinSettings = 'top=50,left=50,width=600,height=300,scrollbars=auto,status=no,resizable=no,dependent=yes,alwaysRaised=yes';
+              var params = '';
+              var lookupWin = window.open(viewName, params, lookupWinSettings);
+              if(lookupWin.opener == null) lookupWin.opener = self;
+              lookupWin.focus();
+          }
+      </script>
+      <div class="screenlet">
+        <div class="screenlet-title-bar">
+          <h3>${uiLabelMap.WebtoolsServiceECA}</h3>
+        </div>
+        <table class="basic-table" cellspacing='0'>
+          <tr class="header-row">
+            <td>${uiLabelMap.WebtoolsEventName}</td>
+            <#if ecaMapList.runOnError??>
+              <td>${uiLabelMap.WebtoolsRunOnError}</td>
+            </#if>
+            <#if ecaMapList.runOnFailure??>
+              <td>${uiLabelMap.WebtoolsRunOnFailure}</td>
+            </#if>
+            <td>${uiLabelMap.WebtoolsActions}</td>
+            <td>${uiLabelMap.WebtoolsConditions}</td>
+            <td>${uiLabelMap.WebtoolsSet}</td>
+          </tr>
+          <#list ecaMapList as ecaMap>
+            <tr>
+              <td>${ecaMap.eventName!}</td>
+              <#if ecaMap.runOnError??>
+                <td>${ecaMap.runOnError}</div></td>
+              </#if>
+              <#if ecaMap.runOnFailure??>
+                <td>${ecaMap.runOnFailure}</div></td>
+              </#if>
+              <#if ecaMap.actions?has_content>
+                <td>
+                  <#list ecaMap.actions as action>
+                    <table class="basic-table" cellspacing='0'>
+                      <tr>
+                        <td colspan="2"><a href='<@ofbizUrl>${url}?sel_service_name=${action.serviceName}</@ofbizUrl>'>${action.serviceName?default(uiLabelMap.CommonNA)}</a></td>
+                      </tr>
+                      <tr>
+                        <td><b>${uiLabelMap.WebtoolsSecasIgnoreError}</b> ${action.ignoreError?default(uiLabelMap.CommonNA)}</td>
+                        <td><b>${uiLabelMap.WebtoolsSecasIgnoreFailure}</b> ${action.ignoreFailure?default(uiLabelMap.CommonNA)}</td>
+                      </tr>
+                      <tr>
+                        <td><b>${uiLabelMap.WebtoolsSecasPersist}</b> ${action.persist?default(uiLabelMap.CommonNA)}</td>
+                        <td><b>${uiLabelMap.WebtoolsSecasResultMapName}</b> ${action.resultMapName?default(uiLabelMap.CommonNA)}</td>
+                      </tr>
+                      <tr>
+                        <td><b>${uiLabelMap.WebtoolsSecasResultToContext}</b> ${action.resultToContext?default(uiLabelMap.CommonNA)}</td>
+                        <td><b>${uiLabelMap.WebtoolsSecasResultToResult}</b> ${action.resultToResult?default(uiLabelMap.CommonNA)}</td>
+                      </tr>
+                      <tr>
+                        <td><b>${uiLabelMap.WebtoolsSecasServiceMode}</b> ${action.serviceMode?default(uiLabelMap.CommonNA)}</td>
+                        <td colspan="2">&nbsp;</td>
+                      </tr>
+                    </table>
+                  </#list>
+                </td>
+              </#if>
+              <#if ecaMap.conditions?has_content>
+                <td>
+                  <#list ecaMap.conditions as condition>
+                    <table class='basic-table' cellspacing='0'>
+                      <tr>
+                        <td><b>${uiLabelMap.WebtoolsCompareType}</b> ${condition.compareType?default(uiLabelMap.CommonNA)}</td>
+                        <td>
+                          <b>${uiLabelMap.WebtoolsConditionService}</b>
+                          <#if condition.conditionService?has_content>
+                            <a href='<@ofbizUrl>${url}?sel_service_name=${condition.conditionService}</@ofbizUrl>'>${condition.conditionService?default(uiLabelMap.CommonNA)}</a>
+                          <#else>
+                            ${condition.conditionService?default(uiLabelMap.CommonNA)}
+                          </#if>
+                        </td>
+                        <td><b>${uiLabelMap.WebtoolsFormat}</b> ${condition.format?default(uiLabelMap.CommonNA)}</td>
+                      </tr>
+                      <tr>
+                        <td><b>${uiLabelMap.WebtoolsIsService}</b> ${condition.isService?default(uiLabelMap.CommonNA)}</td>
+                        <td><b>${uiLabelMap.WebtoolsIsConstant}</b> ${condition.isConstant?default(uiLabelMap.CommonNA)}</td>
+                        <td><b>${uiLabelMap.WebtoolsOperator}</b> ${condition.operator?default(uiLabelMap.CommonNA)}</td>
+                      </tr>
+                      <tr>
+                        <td><b>${uiLabelMap.WebtoolsLHSMapName}</b> ${condition.lhsMapName?default(uiLabelMap.CommonNA)}</td>
+                        <td><b>${uiLabelMap.WebtoolsLHSValueName}</b> ${condition.lhsValueName?default(uiLabelMap.CommonNA)}</td>
+                        <td>&nbsp;</td>
+                      </tr>
+                      <tr>
+                        <td><b>${uiLabelMap.WebtoolsRHSMapName}</b> ${condition.rhsMapName?default(uiLabelMap.CommonNA)}</td>
+                        <td><b>${uiLabelMap.WebtoolsRHSValueName}</b> ${condition.rhsValueName?default(uiLabelMap.CommonNA)}</td>
+                        <td>&nbsp;</td>
+                      </tr>
+                    </table><br />
+                  </#list>
+                </td>
+              </#if>
+              <#if ecaMap.sets?has_content>
+                <td>
+                  <#list ecaMap.sets as set>
+                    <table class='basic-table' cellspacing='0'>
+                      <tr>
+                        <td><b>${uiLabelMap.WebtoolsFieldName}</b> ${set.fieldName?default(uiLabelMap.CommonNA)}</td>
+                        <td colspan="2">&nbsp;</td>
+                      </tr>
+                      <tr>
+                        <#if set.envName?has_content>
+                          <td><b>${uiLabelMap.WebtoolsEnvName}</b> ${set.envName}</td>
+                          <td colspan="2">&nbsp;</td>
+                        </#if>
+                      </tr>
+                      <tr>
+                        <#if set.value?has_content>
+                          <td><b>${uiLabelMap.CommonValue}</b> ${set.value}</td>
+                          <td colspan="2">&nbsp;</td>
+                        </#if>
+                      </tr>
+                      <tr>
+                        <#if set.format?has_content>
+                          <td><b>${uiLabelMap.WebtoolsFormat}</b> ${set.format}</td>
+                          <td colspan="2">&nbsp;</td>
+                        </#if>
+                      </tr>
+                    </table><br />
+                  </#list>
+                </td>
+              </#if>
+            </tr>
+            <tr><td colspan='5'><hr/></td></tr>
+          </#list>
+        </table>
+      </div>
+    </#if>
+    <#-- End if service has ECA's -->
+
+    <#list selectedServiceMap.allParamsList! as paramList>
+      <style type="text/css">
+        .param-table tr td {
+          width: 12.5%;
+          vertical-align: top;
+        }
+      </style>
+      <div class="screenlet">
+        <div class="screenlet-title-bar">
+          <h3>${paramList.title}</h3>
+        </div>
+        <#if paramList.paramList?? && paramList.paramList?has_content>
+          <table class="basic-table param-table" cellspacing='0'>
+              <tr class="header-row">
+                <td>${uiLabelMap.WebtoolsParameterName}</td>
+                <td>${uiLabelMap.CommonDescription}</td>
+                <td>${uiLabelMap.WebtoolsOptional}</td>
+                <td>${uiLabelMap.CommonType}</td>
+                <#-- <td>Default Value</td> -->
+                <td>${uiLabelMap.WebtoolsMode}</td>
+                <td>${uiLabelMap.WebtoolsIsSetInternally}</td>
+                <td>${uiLabelMap.WebtoolsEntityName}</td>
+                <td>${uiLabelMap.WebtoolsFieldName}</td>
+              </tr>
+              <#list paramList.paramList as modelParam>
+                <tr>
+                  <td>${modelParam.name!}</td>
+                  <td>${modelParam.description!}</td>
+                  <td>${modelParam.optional!}</td>
+                  <td>${modelParam.type!}</td>
+                  <#-- <td>[${modelParam.defaultValue!}]</td> -->
+                  <td>${modelParam.mode!}</td>
+                  <td>${modelParam.internal!}</td>
+                  <td>
+                    <#if modelParam.entityName??>
+                      <a href='<@ofbizUrl>${url}?constraint=default_entity_name@${modelParam.entityName}</@ofbizUrl>'>${modelParam.entityName!}</a>
+                    </#if>
+                  </td>
+                  <td>${modelParam.fieldName!}</td>
+                </tr>
+              </#list>
+          </table>
+        <#else>
+          <div class="screenlet-body">
+            ${uiLabelMap.WebtoolsNoParametersDefined}
+          </div>
+        </#if>
+      </div>
+    </#list>
+
+    <#-- Show a little form for exportServiceEoModelBundle -->
+    <div class="screenlet-body">
+      <form name="exportServiceEoModelBundle" method="post" action="<@ofbizUrl>exportServiceEoModelBundle</@ofbizUrl>" class="basic-form">
+        <input type="hidden" name="sel_service_name" value="${selectedServiceMap.serviceName}"/>
+        <input type="hidden" name="serviceName" value="${selectedServiceMap.serviceName}"/>
+        Save eomodeld to Local Path: <input type="text" name="eomodeldFullPath" value="${parameters.eomodeldFullPath!}" size="60"/>
+        <input type="submit" name="submitButton" value="Export"/>
+      </form>
+    </div>
+  </#if>
+<#-- No Service selected , we list all-->
+<#elseif servicesList?? && servicesList?has_content>
+
+  <#-- Show alphabetical index -->
+  <#if serviceNamesAlphaList?? && serviceNamesAlphaList?has_content>
+      <div class="button-bar">
+        <#assign isfirst=true>
+        <#list serviceNamesAlphaList as alpha>
+          <a href='<@ofbizUrl>${url}?constraint=alpha@${alpha}</@ofbizUrl>'>${alpha}</a>
+          <#assign isfirst=false>
+        </#list>
+      </div>
+  </#if>
+
+  <div class="screenlet">
+    <div class="screenlet-body">
+      <label>${uiLabelMap.WebtoolsServicesListFor} ${dispatcherName?default(uiLabelMap.CommonNA)} (${servicesFoundCount} ${uiLabelMap.CommonFound})</label>
+      <table class="basic-table hover-bar" cellspacing='0'>
+        <tr class="header-row">
+          <td>${uiLabelMap.WebtoolsServiceName}</td>
+          <td>${uiLabelMap.WebtoolsEngineName}</td>
+          <td>${uiLabelMap.WebtoolsDefaultEntityName}</td>
+          <td>${uiLabelMap.WebtoolsInvoke}</td>
+          <td>${uiLabelMap.WebtoolsLocation}</td>
+          <td>${uiLabelMap.WebtoolsDefinitionLocation}</td>
+        </tr>
+        <#assign alt_row = false>
+        <#list servicesList as service>
+          <tr<#if alt_row> class="alternate-row"</#if>>
+            <td><a href='<@ofbizUrl>${url}?sel_service_name=${service.serviceName}</@ofbizUrl>'>${service.serviceName}</a></td>
+            <td><a href='<@ofbizUrl>${url}?constraint=engine_name@${service.engineName?default(uiLabelMap.CommonNA)}</@ofbizUrl>'>${service.engineName}</a></td>
+            <td><a href='<@ofbizUrl>${url}?constraint=default_entity_name@${service.defaultEntityName?default(uiLabelMap.CommonNA)}</@ofbizUrl>'>${service.defaultEntityName}</a></td>
+            <td>${service.invoke}</td>
+            <td><a href='<@ofbizUrl>${url}?constraint=location@${service.location?default(uiLabelMap.CommonNA)}</@ofbizUrl>'>${service.location}</a></td>
+            <td><a href='<@ofbizUrl>${url}?constraint=definitionLocation@${service.definitionLocation}</@ofbizUrl>'>${service.definitionLocation}</a></td>
+          </tr>
+          <#assign alt_row = !alt_row>
+        </#list>
+      </table>
+    </div>
+  </div>
+<#else>
+  ${uiLabelMap.WebtoolsNoServicesFound}.
+  <a href='<@ofbizUrl>${url}</@ofbizUrl>' class="smallSubmit">${uiLabelMap.CommonListAll}</a>
+</#if>
Index: framework/webtools/template/service/serviceResult.ftl
===================================================================
--- framework/webtools/template/service/serviceResult.ftl	(revision 0)
+++ framework/webtools/template/service/serviceResult.ftl	(revision 0)
@@ -0,0 +1,52 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <h3>${uiLabelMap.PageTitleScheduleJob}</h3>
+  </div>
+  <div class="screenlet-body" align="center">
+    <form method="post" action="<@ofbizUrl>saveServiceResultsToSession</@ofbizUrl>"
+        <table class="basic-table" cellspacing="0">
+          <tr class="header-row">
+            <td>${uiLabelMap.WebtoolsParameterName}</td>
+            <td>${uiLabelMap.WebtoolsParameterValue}</td>
+            <td>${uiLabelMap.WebtoolsServiceSaveValue} ?</td>
+          </tr>
+            <#if serviceResultList?has_content>
+              <#list serviceResultList as srl>
+                <tr>
+                  <#if srl.hasChild=="Y">
+                    <td><a href="<@ofbizUrl>/serviceResult?servicePath=</@ofbizUrl><#if parameters.servicePath??>${parameters.servicePath}||</#if>${srl.key!}">${srl.key!}</a></td>
+                  <#else>
+                    <td>${srl.key!}</td>
+                  </#if>
+                    <td>${srl.value!}</td>
+                    <td><input type="checkbox" name="<#if parameters.servicePath??>${parameters.servicePath}||</#if>${srl.key!}" /></td>
+                  </tr>
+               </#list>
+            </#if>
+          <tr>
+            <td>&nbsp;</td>
+            <td class="label">${uiLabelMap.WebtoolsServiceClearPreviousParams} ? <input type="checkbox" name="_CLEAR_PREVIOUS_PARAMS_" /></td>
+            <td><input type="submit" value="${uiLabelMap.CommonSubmit}"/></td>
+          </tr>
+        </table>
+      </form>
+  </div>
+</div>
Index: framework/webtools/template/service/setServiceParameter.ftl
===================================================================
--- framework/webtools/template/service/setServiceParameter.ftl	(revision 0)
+++ framework/webtools/template/service/setServiceParameter.ftl	(revision 0)
@@ -0,0 +1,40 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<form name="scheduleForm" method="post" action="<@ofbizUrl>scheduleService</@ofbizUrl>">
+    <#list scheduleOptions as scheduleOption>
+      <input type="hidden" name="${scheduleOption.name}" value="${scheduleOption.value}"/>
+    </#list>
+
+    <table class="basic-table" cellspacing="0">
+
+    <#list serviceParameters as serviceParameter>
+      <tr>
+        <td class="label">${serviceParameter.name} (${serviceParameter.type})</td>
+        <td>
+          <input type="text" size="20" name="${serviceParameter.name}" value="${serviceParameter.value!}" <#if serviceParameter.optional == "N">class="required"</#if>/>
+          <#if serviceParameter.optional == "N"><span class="tooltip">${uiLabelMap.CommonRequired}</span></#if>
+          <#if serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault} ${serviceParameter.defaultValue}</#if>
+        </td>
+      </tr>
+    </#list>
+      <tr>
+        <td colspan="2" align="center"><input type="submit" value="${uiLabelMap.CommonSubmit}" /></td>
+      </tr>
+    </table>
+</form>
\ No newline at end of file
Index: framework/webtools/template/service/setServiceParameterSync.ftl
===================================================================
--- framework/webtools/template/service/setServiceParameterSync.ftl	(revision 0)
+++ framework/webtools/template/service/setServiceParameterSync.ftl	(revision 0)
@@ -0,0 +1,45 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<form name="scheduleForm" method="post" action="<@ofbizUrl>scheduleServiceSync</@ofbizUrl>">
+    <#list scheduleOptions as scheduleOption>
+      <input type="hidden" name="${scheduleOption.name}" value="${scheduleOption.value}"/>
+    </#list>
+
+    <table class="basic-table" cellspacing="0">
+
+    <#list serviceParameters as serviceParameter>
+      <tr>
+        <td class="label">${serviceParameter.name} (${serviceParameter.type})</td>
+        <td>
+          <input type="text" size="20" name="${serviceParameter.name}" value="<#if serviceParameter.value??>${serviceParameter.value?string}</#if>"<#if serviceParameter.optional == "N"> class="required"</#if>/>
+          <#if serviceParameter.optional == "N"><span class="tooltip">${uiLabelMap.CommonRequired}</span></#if>
+          <#if serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault} ${serviceParameter.defaultValue?string}</#if>
+          <#if serviceParameter_index == 0>
+            <script language="JavaScript" type="text/javascript">
+              document.scheduleForm.${serviceParameter.name}.focus();
+            </script>
+          </#if>
+        </td>
+      </tr>
+    </#list>
+      <tr>
+        <td colspan="2" align="center"><input type="submit" value="${uiLabelMap.CommonSubmit}" /></td>
+      </tr>
+    </table>
+</form>
Index: framework/webtools/template/service/threads.ftl
===================================================================
--- framework/webtools/template/service/threads.ftl	(revision 0)
+++ framework/webtools/template/service/threads.ftl	(revision 0)
@@ -0,0 +1,54 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#if parameters.maxElements?has_content><#assign maxElements = parameters.maxElements?number/><#else><#assign maxElements = 10/></#if>
+
+    <p>${uiLabelMap.WebtoolsThisThread}<b> ${Static["java.lang.Thread"].currentThread().getName()} (${Static["java.lang.Thread"].currentThread().getId()})</b></p>
+    <br />
+    <table class="basic-table hover-bar" cellspacing="0">
+      <tr class="header-row">
+        <td>${uiLabelMap.WebtoolsGroup}</td>
+        <td>${uiLabelMap.WebtoolsThreadId}</td>
+        <td>${uiLabelMap.WebtoolsThread}</td>
+        <td>${uiLabelMap.CommonStatus}</td>
+        <td>${uiLabelMap.WebtoolsPriority}</td>
+        <td>${uiLabelMap.WebtoolsDaemon}</td>
+      </tr>
+      <#assign alt_row = false>
+      <#list allThreadList as javaThread>
+      <#if javaThread??>
+        <#assign stackTraceArray = javaThread.getStackTrace()/>
+        <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+          <td valign="top">${(javaThread.getThreadGroup().getName())!}</td>
+          <td valign="top">${javaThread.getId()?string}</td>
+          <td valign="top">
+            <b>${javaThread.getName()!}</b>
+            <#list 1..maxElements as stackIdx>
+              <#assign stackElement = stackTraceArray[stackIdx]!/>
+              <#if (stackElement.toString())?has_content><div>${stackElement.toString()}</div></#if>
+            </#list>
+          </td>
+          <td valign="top">${javaThread.getState().name()!}&nbsp;</td>
+          <td valign="top">${javaThread.getPriority()}</td>
+          <td valign="top">${javaThread.isDaemon()?string}<#-- /${javaThread.isAlive()?string}/${javaThread.isInterrupted()?string} --></td>
+        </tr>
+      </#if>
+      <#-- toggle the row color -->
+      <#assign alt_row = !alt_row>
+      </#list>
+    </table>
Index: framework/webtools/template/showDateTime.ftl
===================================================================
--- framework/webtools/template/showDateTime.ftl	(revision 0)
+++ framework/webtools/template/showDateTime.ftl	(revision 0)
@@ -0,0 +1,19 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()}
\ No newline at end of file
Index: framework/webtools/template/tempexpr/tempExprMacros.ftl
===================================================================
--- framework/webtools/template/tempexpr/tempExprMacros.ftl	(revision 0)
+++ framework/webtools/template/tempexpr/tempExprMacros.ftl	(revision 0)
@@ -0,0 +1,177 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#--
+To use these macros in your template, insert the following line in
+your template file:
+<#include "component://common/webcommon/includes/tempExprMacros.ftl"/>
+-->
+
+<#include "component://common/webcommon/includes/commonMacros.ftl"/>
+
+<#assign
+  occurrenceList = Static["org.ofbiz.service.calendar.ExpressionUiHelper"].getOccurrenceList()
+  frequencyTypeList = Static["org.ofbiz.service.calendar.ExpressionUiHelper"].getFrequencyValueList(uiLabelMap)
+  firstDayOfWeek = Static["org.ofbiz.service.calendar.ExpressionUiHelper"].getFirstDayOfWeek(locale)
+  lastDayOfWeek = Static["org.ofbiz.service.calendar.ExpressionUiHelper"].getLastDayOfWeek(locale)
+/>
+
+<#macro DateRange formName="" fromDate="" toDate="">
+  <tr>
+    <td class="label">${uiLabelMap.CommonFrom}</td>
+    <td>
+      <@DateField formName=formName fieldName="date1" fieldValue=fromDate/>
+    </td>
+  </tr>
+  <tr>
+    <td class="label">${uiLabelMap.CommonTo}</td>
+    <td>
+      <@DateField formName=formName fieldName="date2" fieldValue=toDate/>
+    </td>
+  </tr>
+</#macro>
+
+<#macro DayInMonth occurrence=0 day=firstDayOfWeek>
+  <tr>
+    <td class="label">${uiLabelMap.TemporalExpressionOccurrence}</td>
+    <td>
+      <select name="integer2">
+        <#list 1..5 as i>
+          <option value="${i}"<#if i == occurrence> selected="selected"</#if>>${i}</option>
+        </#list>
+        <#list -1..-5 as i>
+          <option value="${i}"<#if i == occurrence> selected="selected"</#if>>${i}</option>
+        </#list>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="label">${uiLabelMap.CommonDay}</td>
+    <td><@DayOfWeekField fieldName="integer1" fieldValue=day/></td>
+  </tr>
+</#macro>
+
+<#macro DayOfMonthRange fromDay=1 toDay=31>
+  <tr>
+    <td class="label">${uiLabelMap.CommonFrom}</td>
+    <td><@DayOfMonthField fieldName="integer1" fieldValue=fromDay/></td>
+  </tr>
+  <tr>
+    <td class="label">${uiLabelMap.CommonTo}</td>
+    <td><@DayOfMonthField fieldName="integer2" fieldValue=toDay/></td>
+  </tr>
+</#macro>
+
+<#macro HourOfDayRange fromHour=1 toHour=23>
+  <tr>
+    <td class="label">${uiLabelMap.CommonFrom}</td>
+    <td><@HourOfDayField fieldName="integer1" fieldValue=fromHour/></td>
+  </tr>
+  <tr>
+    <td class="label">${uiLabelMap.CommonTo}</td>
+    <td><@HourOfDayField fieldName="integer2" fieldValue=toHour/></td>
+  </tr>
+</#macro>
+
+<#macro DayOfWeekRange fromDay=firstDayOfWeek toDay=lastDayOfWeek>
+  <tr>
+    <td class="label">${uiLabelMap.CommonFrom}</td>
+    <td><@DayOfWeekField fieldName="integer1" fieldValue=fromDay/></td>
+  </tr>
+  <tr>
+    <td class="label">${uiLabelMap.CommonTo}</td>
+    <td><@DayOfWeekField fieldName="integer2" fieldValue=toDay/></td>
+  </tr>
+</#macro>
+
+<#macro Frequency formName="" fromDate="" freqType=-1 freqValue=0>
+  <tr>
+    <td class="label">${uiLabelMap.CommonFrom}</td>
+    <td>
+      <@DateField formName=formName fieldName="date1" fieldValue=fromDate/>
+    </td>
+  </tr>
+  <tr>
+    <td class="label">${uiLabelMap.TemporalExpressionFreqType}</td>
+    <td>
+      <select name="integer1">
+        <#list frequencyTypeList as freqTypeItem>
+          <option value="${freqTypeItem.value}"<#if freqTypeItem.value == freqType> selected="selected"</#if>>${freqTypeItem.description}</option>
+        </#list>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="label">${uiLabelMap.TemporalExpressionFreqCount}</td>
+    <td>
+      <select name="integer2">
+        <#list 1..50 as i>
+          <option value="${i}"<#if i == freqValue> selected="selected"</#if>>${i}</option>
+        </#list>
+      </select>
+    </td>
+  </tr>
+</#macro>
+
+<#macro MinuteRange fromMinute=1 toMinute=59>
+  <tr>
+    <td class="label">${uiLabelMap.CommonFrom}</td>
+    <td><@MinuteField fieldName="integer1" fieldValue=fromMinute/></td>
+  </tr>
+  <tr>
+    <td class="label">${uiLabelMap.CommonTo}</td>
+    <td><@MinuteField fieldName="integer2" fieldValue=toMinute/></td>
+  </tr>
+</#macro>
+
+<#macro MonthRange fromMonth=0 toMonth=11>
+  <tr>
+    <td class="label">${uiLabelMap.CommonFrom}</td>
+    <td><@MonthField fieldName="integer1" fieldValue=fromMonth/></td>
+  </tr>
+  <tr>
+    <td class="label">${uiLabelMap.CommonTo}</td>
+    <td><@MonthField fieldName="integer2" fieldValue=toMonth/></td>
+  </tr>
+</#macro>
+
+<#macro TimeOfDayRange fromTime="" toTime="" freqType=11 freqValue=1>
+  <tr>
+    <td class="label">${uiLabelMap.CommonFrom}</td>
+    <td><input type="text" name="string1" value="${fromTime}" maxlength="8" size="8"/><span class="tooltip">${uiLabelMap.TemporalExpressionTimeFormat}</span></td>
+  </tr>
+  <tr>
+    <td class="label">${uiLabelMap.CommonTo}</td>
+    <td><input type="text" name="string2" value="${toTime}" maxlength="8" size="8"/><span class="tooltip">${uiLabelMap.TemporalExpressionTimeFormat}</span></td>
+  </tr>
+  <tr>
+    <td class="label">${uiLabelMap.TemporalExpressionFreqType}</td>
+    <td>
+      <select name="integer1">
+        <option value="13"<#if freqType == 13> selected="selected"</#if>>${uiLabelMap.CommonSecond}</option>
+        <option value="12"<#if freqType == 12> selected="selected"</#if>>${uiLabelMap.CommonMinute}</option>
+        <option value="11"<#if freqType == 11> selected="selected"</#if>>${uiLabelMap.CommonHour}</option>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="label">${uiLabelMap.TemporalExpressionFreqCount}</td>
+    <td><input type="text" name="integer2" value="${freqValue}" maxlength="8" size="8"/></td>
+  </tr>
+</#macro>
Index: framework/webtools/template/tempexpr/tempExprMaint.ftl
===================================================================
--- framework/webtools/template/tempexpr/tempExprMaint.ftl	(revision 0)
+++ framework/webtools/template/tempexpr/tempExprMaint.ftl	(revision 0)
@@ -0,0 +1,191 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#include "tempExprMacros.ftl"/>
+<h1>${title}</h1>
+<#if temporalExpression?has_content>
+  <#-- Edit existing expression -->
+  <#if !"INTERSECTION.UNION.DIFFERENCE.SUBSTITUTION"?contains(temporalExpression.tempExprTypeId)>
+    <form name="updateExpression" method="post" action="<@ofbizUrl>updateTemporalExpression</@ofbizUrl>">
+      <input type="hidden" name="tempExprId" value="${temporalExpression.tempExprId}"/>
+      <input type="hidden" name="tempExprTypeId" value="${temporalExpression.tempExprTypeId}"/>
+  </#if>
+  <table class="basic-table" cellspacing="0">
+    <tr>
+      <td class="label">${uiLabelMap.TemporalExpressionId}</td>
+      <td>${temporalExpression.tempExprId}</td>
+    </tr>
+    <tr>
+      <td class="label">${uiLabelMap.TemporalExpressionType}</td>
+      <td>${uiLabelMap.get("TemporalExpression_" + temporalExpression.tempExprTypeId)}</td>
+    </tr>
+  <#if !"INTERSECTION.UNION.DIFFERENCE.SUBSTITUTION"?contains(temporalExpression.tempExprTypeId)>
+    <tr>
+      <td class="label">${uiLabelMap.CommonDescription}</td>
+      <td><input type="text" name="description" value="${temporalExpression.description!}" maxlength="60" size="20"/></td>
+    </tr>
+  <#else>
+    <tr>
+      <td class="label">${uiLabelMap.CommonDescription}</td>
+      <td>${temporalExpression.get("description",locale)!}</td>
+    </tr>
+  </#if>
+    <#if temporalExpression.tempExprTypeId == "DATE_RANGE">
+      <@DateRange formName="updateExpression" fromDate=temporalExpression.date1 toDate=temporalExpression.date2/>
+    <#elseif temporalExpression.tempExprTypeId == "DAY_IN_MONTH">
+      <@DayInMonth occurrence=temporalExpression.integer2 day=temporalExpression.integer1/>
+    <#elseif temporalExpression.tempExprTypeId == "DAY_OF_MONTH_RANGE">
+      <@DayOfMonthRange fromDay=temporalExpression.integer1 toDay=temporalExpression.integer2/>
+    <#elseif temporalExpression.tempExprTypeId == "DAY_OF_WEEK_RANGE">
+      <@DayOfWeekRange fromDay=temporalExpression.integer1 toDay=temporalExpression.integer2/>
+    <#elseif temporalExpression.tempExprTypeId == "FREQUENCY">
+      <@Frequency formName="updateExpression" fromDate=temporalExpression.date1 freqType=temporalExpression.integer1 freqValue=temporalExpression.integer2/>
+    <#elseif temporalExpression.tempExprTypeId == "DAY_OF_WEEK_RANGE">
+      <@DayOfWeekRange fromDay=temporalExpression.integer1 toDay=temporalExpression.integer2/>
+    <#elseif temporalExpression.tempExprTypeId == "HOUR_RANGE">
+      <@HourOfDayRange fromHour=temporalExpression.integer1 toHour=temporalExpression.integer2/>
+    <#elseif temporalExpression.tempExprTypeId == "MINUTE_RANGE">
+      <@MinuteRange fromMinute=temporalExpression.integer1 toMinute=temporalExpression.integer2/>
+    <#elseif temporalExpression.tempExprTypeId == "MONTH_RANGE">
+      <@MonthRange fromMonth=temporalExpression.integer1 toMonth=temporalExpression.integer2/>
+    <#elseif temporalExpression.tempExprTypeId == "TIME_OF_DAY_RANGE">
+      <@TimeOfDayRange fromTime=temporalExpression.string1 toTime=temporalExpression.string2 freqType=temporalExpression.integer1 freqValue=temporalExpression.integer2/>
+    <#elseif "INTERSECTION.UNION.DIFFERENCE.SUBSTITUTION"?contains(temporalExpression.tempExprTypeId)>
+      <#assign candidateIdList = Static["org.ofbiz.service.calendar.ExpressionUiHelper"].getCandidateIncludeIds(delegator, temporalExpression.tempExprId)/>
+      <#if "INTERSECTION.UNION"?contains(temporalExpression.tempExprTypeId)>
+        <tr>
+          <td class="label">${uiLabelMap.TemporalExpressionInclude}</td>
+          <td><@CreateExprAssocForm formName="includeExpression"/></td>
+        </tr>
+      <#else>
+        <#assign hasInclude = false hasExclude = false hasSubstitution = false/>
+        <#if childExpressionList?has_content>
+          <#list childExpressionList as childExpression>
+            <#if childExpression.exprAssocType == "INCLUDE">
+              <#assign hasInclude = true/>
+            <#elseif childExpression.exprAssocType == "EXCLUDE">
+              <#assign hasExclude = true/>
+            <#elseif childExpression.exprAssocType == "SUBSTITUTION">
+              <#assign hasSubstitution = true/>
+            </#if>
+          </#list>
+        </#if>
+        <#if !hasInclude>
+          <tr>
+            <td class="label">${uiLabelMap.TemporalExpressionInclude}</td>
+            <td><@CreateExprAssocForm formName="includeExpression" exprAssocType="INCLUDE"/></td>
+          </tr>
+        </#if>
+        <#if !hasExclude>
+          <tr>
+            <td class="label">${uiLabelMap.TemporalExpressionExclude}</td>
+            <td><@CreateExprAssocForm formName="excludeExpression" exprAssocType="EXCLUDE"/></td>
+          </tr>
+        </#if>
+        <#if !hasSubstitution && temporalExpression.tempExprTypeId == "SUBSTITUTION">
+          <tr>
+            <td class="label">${uiLabelMap.TemporalExpression_SUBSTITUTION}</td>
+            <td><@CreateExprAssocForm formName="substitutionExpression" exprAssocType="SUBSTITUTION"/></td>
+          </tr>
+        </#if>
+      </#if>
+    </#if>
+    <#if !"INTERSECTION.UNION.DIFFERENCE.SUBSTITUTION"?contains(temporalExpression.tempExprTypeId)>
+        <tr>
+          <td>&nbsp;</td>
+          <td><input type="submit" name="submitBtn" value="${uiLabelMap.CommonSave}"/></td>
+        </tr>
+      </table>
+      </form>
+    <#else>
+      </table>    
+    </#if>
+<#else>
+  <#-- Create new expression -->
+  <@CreateForm "DATE_RANGE" CreateDateRange/>
+  <hr />
+  <@CreateForm "DAY_IN_MONTH" DayInMonth/>
+  <hr />
+  <@CreateForm "DAY_OF_MONTH_RANGE" DayOfMonthRange/>
+  <hr />
+  <@CreateForm "DAY_OF_WEEK_RANGE" DayOfWeekRange/>
+  <hr />
+  <@CreateForm "FREQUENCY" CreateFrequency/>
+  <hr />
+  <@CreateForm "HOUR_RANGE" HourOfDayRange/>
+  <hr />
+  <@CreateForm "MINUTE_RANGE" MinuteRange/>
+  <hr />
+  <@CreateForm "MONTH_RANGE" MonthRange/>
+  <hr />
+  <@CreateForm "TIME_OF_DAY_RANGE" TimeOfDayRange/>
+  <hr />
+  <@CreateForm "INTERSECTION"/>
+  <hr />
+  <@CreateForm "UNION"/>
+  <hr />
+  <@CreateForm "DIFFERENCE"/>
+  <hr />
+  <@CreateForm "SUBSTITUTION"/>
+</#if>
+
+<#macro CreateForm expressionTypeId="" formContents=NullMacro>
+  <form name="${expressionTypeId}" method="post" action="<@ofbizUrl>createTemporalExpression</@ofbizUrl>">
+    <input type="hidden" name="tempExprTypeId" value="${expressionTypeId}"/>
+    <table class="basic-table" cellspacing="0">
+      <#assign mapExpression = "TemporalExpression_" + expressionTypeId/>
+      <#assign headingText = uiLabelMap[mapExpression]/>
+      <tr><td colspan="2" class="h2">${headingText}</td></tr>
+      <tr>
+        <td class="label">${uiLabelMap.TemporalExpressionId}</td>
+        <td><input name="tempExprId" type="text" maxlength="20" size="20"/><span class="tooltip">${uiLabelMap.CommonAutoAssignedId}</span></td>
+      </tr>
+      <tr>
+        <td class="label">${uiLabelMap.CommonDescription}</td>
+        <td><input name="description" type="text" maxlength="60" size="20"/></td>
+      </tr>
+      <@formContents/>
+      <tr>
+        <td>&nbsp;</td>
+        <td><input type="submit" name="submitBtn" value="${uiLabelMap.CommonSave}"/></td>
+      </tr>
+    </table>
+  </form>
+</#macro>
+
+<#macro CreateDateRange>
+  <@DateRange formName="DATE_RANGE"/>
+</#macro>
+
+<#macro CreateFrequency>
+  <@Frequency formName="FREQUENCY"/>
+</#macro>
+
+<#macro CreateExprAssocForm formName="" exprAssocType="">
+  <form name="${formName}" method="post" action="<@ofbizUrl>createTemporalExpressionAssoc</@ofbizUrl>">
+    <input type="hidden" name="tempExprId" value="${temporalExpression.tempExprId}"/>
+    <input type="hidden" name="fromTempExprId" value="${temporalExpression.tempExprId}"/>
+    <input type="hidden" name="exprAssocType" value="${exprAssocType}"/>
+    <select name="toTempExprId">
+      <#list candidateIdList as candidate>
+        <option value="${candidate}">${candidate}</option>
+      </#list>
+    </select>
+    <input type="submit" name="submitBtn" value="${uiLabelMap.CommonSave}"/>
+  </form>
+</#macro>
Index: framework/webtools/webapp/webtools/WEB-INF/controller.xml
===================================================================
--- framework/webtools/webapp/webtools/WEB-INF/controller.xml	(revision 1738254)
+++ framework/webtools/webapp/webtools/WEB-INF/controller.xml	(working copy)
@@ -609,8 +609,8 @@
 
     <!-- View Mappings -->
     <view-map name="main" type="screen" page="component://webtools/widget/CommonScreens.xml#main"/>
-    <view-map name="ping" type="ftl" page="component://webtools/webapp/webtools/ping.ftl"/>
-    <view-map name="showDateTime" type="ftl" page="component://webtools/webapp/webtools/showDateTime.ftl"/>
+    <view-map name="ping" type="ftl" page="component://webtools/template/ping.ftl"/>
+    <view-map name="showDateTime" type="ftl" page="component://webtools/template/showDateTime.ftl"/>
 
     <view-map name="entityref" type="screen" page="component://webtools/widget/EntityScreens.xml#EntityRef"/>
     <view-map name="entityref_list" type="screen" page="component://webtools/widget/EntityScreens.xml#EntityRefList"/>
Index: framework/webtools/webapp/webtools/entity/CheckDb.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/CheckDb.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/CheckDb.ftl	(nonexistent)
@@ -1,120 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-    <h3>${uiLabelMap.WebtoolsCheckUpdateDatabase}</h3>
-    <form method="post" action="${encodeURLCheckDb}">
-        <input type="hidden" name="option" value="checkupdatetables"/>
-        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
-        &nbsp;<input type="checkbox" name="checkPks" value="true" checked="checked"/>&nbsp;${uiLabelMap.WebtoolsPks}
-        &nbsp;<input type="checkbox" name="checkFks" value="true"/>&nbsp;${uiLabelMap.WebtoolsFks}
-        &nbsp;<input type="checkbox" name="checkFkIdx" value="true"/>&nbsp;${uiLabelMap.WebtoolsFkIdx}
-        &nbsp;<input type="checkbox" name="addMissing" value="true"/>&nbsp;${uiLabelMap.WebtoolsAddMissing}
-        &nbsp;<input type="checkbox" name="repair" value="true"/>&nbsp;${uiLabelMap.WebtoolsRepairColumnSizes}
-        <input type="submit" value="${uiLabelMap.WebtoolsCheckUpdateDatabase}"/>
-    </form>
-    <p>${uiLabelMap.WebtoolsNoteUseAtYourOwnRisk}</p>
-    <script language="JavaScript" type="text/javascript">
-         function enableTablesRemove() {
-             document.forms["TablesRemoveForm"].elements["TablesRemoveButton"].disabled=false;
-         }
-    </script>
-    <h3>${uiLabelMap.WebtoolsRemoveAllTables}</h3>
-    <form method="post" action="${encodeURLCheckDb}" name="TablesRemoveForm">
-        <input type="hidden" name="option" value="removetables"/>
-        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
-        <input type="submit" value="${uiLabelMap.CommonRemove}" name="TablesRemoveButton" disabled="disabled"/>
-        <input type="button" value="${uiLabelMap.WebtoolsEnable}" onclick="enableTablesRemove();"/>
-    </form>
-    <form method="post" action="${encodeURLCheckDb}" name="TableRemoveForm">
-        <input type="hidden" name="option" value="removetable"/>
-        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="20"/>
-        ${uiLabelMap.WebtoolsEntityName}: <input type="text" name="entityName" value="${entityName}" size="20"/>
-        <input type="submit" value="${uiLabelMap.CommonRemove}" name="TablesRemoveButton"/>
-    </form>
-    <h3>${uiLabelMap.WebtoolsCreateRemoveAllPrimaryKeys}</h3>
-    <form method="post" action="${encodeURLCheckDb}">
-        <input type="hidden" name="option" value="createpks"/>
-        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
-        <input type="submit" value="${uiLabelMap.CommonCreate}"/>
-    </form>
-    <form method="post" action="${encodeURLCheckDb}">
-        <input type="hidden" name="option" value="removepks"/>
-        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
-        <input type="submit" value="${uiLabelMap.CommonRemove}"/>
-    </form>
-    <h3>${uiLabelMap.WebtoolsCreateRemovePrimaryKey}</h3>
-    <form method="post" action="${encodeURLCheckDb}">
-        <input type="hidden" name="option" value="createpk"/>
-        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="20"/>
-        ${uiLabelMap.WebtoolsEntityName}: <input type="text" name="entityName" value="${entityName}" size="20"/>
-        <input type="submit" value="${uiLabelMap.CommonCreate}"/>
-    </form>
-    <form method="post" action="${encodeURLCheckDb}">
-        <input type="hidden" name="option" value="removepk"/>
-        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="20"/>
-        ${uiLabelMap.WebtoolsEntityName}: <input type="text" name="entityName" value="${entityName}" size="20"/>
-        <input type="submit" value="${uiLabelMap.CommonRemove}"/>
-    </form>
-    <h3>${uiLabelMap.WebtoolsCreateRemoveAllDeclaredIndices}</h3>
-    <form method="post" action="${encodeURLCheckDb}">
-        <input type="hidden" name="option" value="createidx"/>
-        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
-        <input type="submit" value="${uiLabelMap.CommonCreate}"/>
-    </form>
-    <form method="post" action="${encodeURLCheckDb}">
-        <input type="hidden" name="option" value="removeidx"/>
-        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
-        <input type="submit" value="${uiLabelMap.CommonRemove}"/>
-    </form>
-    <h3>${uiLabelMap.WebtoolsCreateRemoveAllForeignKeyIndices}</h3>
-    <form method="post" action="${encodeURLCheckDb}">
-        <input type="hidden" name="option" value="createfkidxs"/>
-        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
-        <input type="submit" value="${uiLabelMap.CommonCreate}"/>
-    </form>
-    <form method="post" action="${encodeURLCheckDb}">
-        <input type="hidden" name="option" value="removefkidxs"/>
-        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
-        <input type="submit" value="${uiLabelMap.CommonRemove}"/>
-    </form>
-    <h3>${uiLabelMap.WebtoolsCreateRemoveAllForeignKeys}</h3>
-    <p>${uiLabelMap.WebtoolsNoteForeighKeysMayAlsoBeCreated}</p>
-    <form method="post" action="${encodeURLCheckDb}">
-        <input type="hidden" name="option" value="createfks"/>
-        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
-        <input type="submit" value="${uiLabelMap.CommonCreate}"/>
-    </form>
-    <form method="post" action="${encodeURLCheckDb}">
-        <input type="hidden" name="option" value="removefks"/>
-        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
-        <input type="submit" value="${uiLabelMap.CommonRemove}"/>
-    </form>
-    <h3>${uiLabelMap.WebtoolsUpdateCharacterSetAndCollate}</h3>
-    <form method="post" action="${encodeURLCheckDb}">
-        <input type="hidden" name="option" value="updateCharsetCollate"/>
-        ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
-        <input type="submit" value="${uiLabelMap.CommonUpdate}"/>
-    </form>
-<#if miters?has_content>
-    <hr />
-    <ul>
-        <#list miters as miter>
-            <li>${miter}</li>
-        </#list>
-    </ul>
-</#if>
Index: framework/webtools/webapp/webtools/entity/ConnectionPoolStatus.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/ConnectionPoolStatus.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/ConnectionPoolStatus.ftl	(nonexistent)
@@ -1,56 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<h1>Connection Pool Status</h1>
-
-<#assign groups = delegator.getModelGroupReader().getGroupNames(delegator.getDelegatorName())!/>
-<table class="basic-table light-grid hover-bar">
-    <tr class="header-row">
-        <td>Helper Name</td>
-        <td>Num Active</td>
-        <td>Num Idle</td>
-        <td>Num Total</td>
-        <td>Max Active</td>
-        <td>Max Idle</td>
-        <td>Min Idle</td>
-        <td>Min Evictable Idle Time</td>
-        <td>Max Wait</td>
-    </tr>
-    <#assign alt_row = false>
-    <#if (groups?has_content)>
-        <#list groups as group>
-            <#assign helper = delegator.getGroupHelperName(group)!/>
-            <#if (helper?has_content)>
-                <#assign dataSourceInfo = Static["org.ofbiz.entity.connection.DBCPConnectionFactory"].getDataSourceInfo(helper)!/>
-                <#if (dataSourceInfo?has_content)>
-                    <tr>
-                        <td>${helper}</td>
-                        <td>${dataSourceInfo.poolNumActive!}</td>
-                        <td>${dataSourceInfo.poolNumIdle!}</td>
-                        <td>${dataSourceInfo.poolNumTotal!}</td>
-                        <td>${dataSourceInfo.poolMaxActive!}</td>
-                        <td>${dataSourceInfo.poolMaxIdle!}</td>
-                        <td>${dataSourceInfo.poolMinIdle!}</td>
-                        <td>${dataSourceInfo.poolMinEvictableIdleTimeMillis!}</td>
-                        <td>${dataSourceInfo.poolMaxWait!}</td>
-                    </tr>
-                </#if>
-            </#if>
-        </#list>
-    </#if>
-</table>
Index: framework/webtools/webapp/webtools/entity/EntityExportAll.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntityExportAll.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/EntityExportAll.ftl	(nonexistent)
@@ -1,36 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<div class="page-title"><span>${uiLabelMap.WebtoolsExportFromDataSource}</span></div>
-<p>${uiLabelMap.WebtoolsXMLExportInfo}</p>
-<#if results?has_content>
-    <hr />
-    <h2>${uiLabelMap.WebtoolsResults}:</h2>
-    <#list results as result>
-        <p>${result}</p>
-    </#list>
-</#if>
-<hr />
-<form method="post" action="<@ofbizUrl>entityExportAll</@ofbizUrl>">
-    ${uiLabelMap.WebtoolsOutputDirectory}: <input type="text" size="60" name="outpath" value="${outpath!}" /><br />
-    ${uiLabelMap.CommonFromDate}: <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/><br/>
-    ${uiLabelMap.WebtoolsTimeoutSeconds}: <input type="text" size="6" value="${txTimeout?default('7200')}" name="txTimeout"/><br />
-    <br />
-    <input type="submit" value="${uiLabelMap.WebtoolsExport}" />
-</form>
Index: framework/webtools/webapp/webtools/entity/EntityImport.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntityImport.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/EntityImport.ftl	(nonexistent)
@@ -1,48 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<div class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div>
-<p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
-<hr />
-
-  <form method="post" action="<@ofbizUrl>entityImport</@ofbizUrl>">
-    ${uiLabelMap.WebtoolsAbsoluteFileNameOrUrl}:<br />
-    <input type="text" size="60" name="filename" value="${filename!}"/><br />
-    ${uiLabelMap.WebtoolsAbsoluteFTLFilename}:<br />
-    <input type="text" size="40" name="fmfilename" value="${fmfilename!}"/><br />
-    <input type="checkbox" name="isUrl" <#if isUrl??>checked="checked"</#if>/>${uiLabelMap.WebtoolsIsURL}<br />
-    <input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br />
-    <input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
-    <input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
-    <input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
-    ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
-    <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div>
-  </form>
-  <form method="post" action="<@ofbizUrl>entityImport</@ofbizUrl>">
-    ${uiLabelMap.WebtoolsCompleteXMLDocument}:<br />
-    <textarea rows="20" cols="85" name="fulltext">${fulltext?default("<entity-engine-xml>\n</entity-engine-xml>")}</textarea>
-    <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportText}"/></div>
-  </form>
-  <#if messages??>
-      <hr />
-      <h3>${uiLabelMap.WebtoolsResults}:</h3>
-      <#list messages as message>
-          <p>${message}</p>
-      </#list>
-  </#if>
Index: framework/webtools/webapp/webtools/entity/EntityImportDir.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntityImportDir.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/EntityImportDir.ftl	(nonexistent)
@@ -1,42 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<div class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div>
-<p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
-<hr />
-
-  <form method="post" action="<@ofbizUrl>entityImportDir</@ofbizUrl>">
-    ${uiLabelMap.WebtoolsAbsolutePath}:<br />
-    <input type="text" size="60" name="path" value="${path!}"/><br />
-    <input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br />
-    <input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
-    <input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
-    <input type="checkbox" name="deleteFiles" <#if (deleteFiles??)>checked="checked"</#if>/>${uiLabelMap.WebtoolsDeleteFiles}<br />
-    <input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
-    ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
-    ${uiLabelMap.WebtoolsPause}:<input type="text" size="6" value="${filePauseStr?default("0")}" name="filePause"/><br />
-    <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div>
-  </form>
-  <#if messages??>
-    <hr />
-    <h1>${uiLabelMap.WebtoolsResults}:</h1>
-    <#list messages as message>
-        <p>${message}</p>
-    </#list>
-  </#if>
Index: framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl	(nonexistent)
@@ -1,39 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<div class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div>
-<p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
-<hr />
-  <form method="post" action="<@ofbizUrl>entityImportReaders</@ofbizUrl>">
-    Enter Readers (comma separated, no spaces; from entityengine.xml and ofbiz-component.xml files; common ones include seed,ext,demo):<br />
-    <input type="text" size="60" name="readers" value="${readers?default("seed")}"/><br />
-    <input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMostlyInserts}<br />
-    <input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
-    <input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
-    <input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
-    ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
-    <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImport}"/></div>
-  </form>
-  <#if messages??>
-      <hr />
-      <h3>${uiLabelMap.WebtoolsResults}:</h3>
-      <#list messages as message>
-          <p>${message}</p>
-      </#list>
-  </#if>
Index: framework/webtools/webapp/webtools/entity/EntityMaint.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntityMaint.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/EntityMaint.ftl	(nonexistent)
@@ -1,110 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-    <div>
-       <form action="<@ofbizUrl>/entitymaint</@ofbizUrl>">
-          <b>${uiLabelMap.CommonGroup}:</b>
-          <select name="filterByGroupName">
-             <option value="">${uiLabelMap.CommonAll}</option>
-             <#list entityGroups as group>
-                <option value="${group}" <#if filterByGroupName??><#if group = filterByGroupName>selected="selected"</#if></#if>>${group}</option>
-             </#list>
-          </select>
-          <b>${uiLabelMap.WebtoolsEntityName}:</b>
-          <input type= "text" name= "filterByEntityName" value="${parameters.filterByEntityName!}"/>
-          <input type="submit" value="${uiLabelMap.CommonApply}"/>
-       </form>
-    </div>
-    <#assign firstChar = "x">
-    <#assign anchor="">
-    <#assign alt_row = false>
-    <#assign right_col = false>
-    <div class="button-bar">
-      <#list entitiesList as entity>
-        <#if entity.entityName?substring(0, 1) != firstChar>
-          <#assign firstChar = entity.entityName?substring(0, 1)>
-          <a href="#Entity_${firstChar}">${firstChar}</a>&nbsp;
-        </#if>
-      </#list>
-    </div>
-    <div class="screenlet">
-      <div class="screenlet-title-bar">
-        <ul>
-          <li class="h3">${uiLabelMap.WebtoolsEntitiesAlpha}</li>
-        </ul>
-        <br class="clear"/>
-      </div>
-      <div class="screenlet-body">
-        <#assign firstChar = "*">
-        <table class="basic-table hover-bar" cellspacing='0'>
-          <tr class="header-row">
-            <td>${uiLabelMap.WebtoolsEntityName}</td>
-            <td>&nbsp;</td>
-            <td>${uiLabelMap.WebtoolsEntityName}</td>
-            <td>&nbsp;</td>
-          </tr>
-          <#list entitiesList as entity>
-            <#if entity.entityName?substring(0, 1) != firstChar>
-              <#if right_col>
-                <td>&nbsp;</td><td>&nbsp;</td></tr>
-                <#assign right_col = false>
-                <#assign alt_row = !alt_row>
-              </#if>
-              <#if firstChar != "*">
-                <tr<#if alt_row> class="alternate-row"</#if>><td colspan="4">&nbsp;</td></tr>
-                <#assign alt_row = !alt_row>
-              </#if>
-              <#assign firstChar = entity.entityName?substring(0, 1)>
-              <#assign anchor="id=\"Entity_${firstChar}\"">
-            </#if>
-            <#if !right_col>
-              <tr<#if alt_row> class="alternate-row"</#if>>
-            </#if>
-
-            <td<#if anchor?has_content> ${anchor}</#if>>${entity.entityName}<#if entity.viewEntity == 'Y'>&nbsp;(${uiLabelMap.WebtoolsEntityView})</#if></td>
-            <#assign anchor="">
-            <td class="button-col">
-              <#if entity.viewEntity == 'Y'>
-                <#if entity.entityPermissionView == 'Y'>
-                  <a href='<@ofbizUrl>ViewRelations?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsReln}</a>
-                  <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsFind}</a>
-                  <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&amp;find=true&amp;VIEW_SIZE=50&amp;VIEW_INDEX=0</@ofbizUrl>'>${uiLabelMap.WebtoolsAll}</a>
-                </#if>
-              <#else>
-                <#if entity.entityPermissionCreate == 'Y'>
-                  <a href='<@ofbizUrl>ViewGeneric?entityName=${entity.entityName}</@ofbizUrl>' title='${uiLabelMap.CommonCreateNew}'>${uiLabelMap.WebtoolsCreate}</a>
-                </#if>
-                <#if entity.entityPermissionView == 'Y'>
-                  <a href='<@ofbizUrl>ViewRelations?entityName=${entity.entityName}</@ofbizUrl>' title='${uiLabelMap.WebtoolsViewRelations}'>${uiLabelMap.WebtoolsReln}</a>
-                  <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}</@ofbizUrl>' title='${uiLabelMap.WebtoolsFindRecord}'>${uiLabelMap.WebtoolsFind}</a>
-                  <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&amp;find=true&amp;VIEW_SIZE=50&amp;VIEW_INDEX=0</@ofbizUrl>' title='${uiLabelMap.WebtoolsFindAllRecords}'>${uiLabelMap.WebtoolsAll}</a>
-                </#if>
-              </#if>
-            </td>
-            <#if right_col>
-              </tr>
-              <#assign alt_row = !alt_row>
-            </#if>
-            <#assign right_col = !right_col>
-          </#list>
-          <#if right_col>
-            <td>&nbsp;</td><td>&nbsp;</td></tr>
-          </#if>
-        </table>
-      </div>
-    </div>
Index: framework/webtools/webapp/webtools/entity/EntityRef.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntityRef.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/EntityRef.ftl	(nonexistent)
@@ -1,32 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<html>
-    <head>
-        <title>${uiLabelMap.WebtoolsEntityReferenceChart}</title>
-    </head>
-    <frameset cols="30%,70%">
-        <frame src="${encodeUrlList}" name="entityListFrame"/>
-        <frame src="${encodeUrlMain}" name="entityFrame"/>
-    </frameset>
-    <noframes>
-        <h2>${uiLabelMap.CommonFrameAlert1}</h2>
-        <p>${uiLabelMap.CommonFrameAlert2}</p>
-        <br />
-    </noframes>
-</html>
Index: framework/webtools/webapp/webtools/entity/EntityRefList.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntityRefList.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/EntityRefList.ftl	(nonexistent)
@@ -1,77 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<#assign docLangAttr = locale.toString()?replace("_", "-")>
-<#assign langDir = "ltr">
-<#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
-    <#assign langDir = "rtl">
-</#if>
-<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>${uiLabelMap.WebtoolsEntityReference}</title>
-        <style type="text/css">
-           body, textarea, input, select {font-family: Helvetica, sans-serif; background-color: #ffffff; text-decoration: none;}
-          .section-header {font-size: 10pt; font-weight: bold; color: #000000; padding-bottom: 10;}
-          .listtext {font-size: 10pt; font-weight: bold; color: blue;}
-          .listtext a {text-decoration: none;}
-          .listtext a:hover {color:red; text-decoration: underline;}
-        </style>
-    </head>
-    <body>
-        <div class='listtext'>
-            <#if !forstatic>
-                <a href="<@ofbizUrl>main</@ofbizUrl>" target='main'>${uiLabelMap.WebtoolsPopupWebToolsMain}</a><br/>
-                <a href="<@ofbizUrl>view/entityref_main</@ofbizUrl>" target="entityFrame">${uiLabelMap.WebtoolsEntityReferenceMainPage}</a><br/>
-                <a href="<@ofbizUrl>view/checkdb</@ofbizUrl>" target="entityFrame">${uiLabelMap.WebtoolsCheckUpdateDatabase}</a>
-                <hr />
-                <#-- want to leave these out because they are only working so-so, and cause people more problems that they solve, IMHO
-                <a href="<@ofbizUrl>ModelWriter</@ofbizUrl>" target='_blank'>Generate Entity Model XML (all in one)</a><br/>
-                <a href="<@ofbizUrl>ModelWriter?savetofile=true</@ofbizUrl>" target='_blank'>Save Entity Model XML to Files</a><br/>
-                -->
-                <#-- this is not working now anyway...
-                <a href="<@ofbizUrl>ModelGroupWriter</@ofbizUrl>" target='_blank'>Generate Entity Group XML</a><br/>
-                <a href="<@ofbizUrl>ModelGroupWriter?savetofile=true</@ofbizUrl>" target='_blank'>Save Entity Group XML to File</a><br/>
-                -->
-                <a href="<@ofbizUrl>view/ModelInduceFromDb</@ofbizUrl>" target='_blank'>${uiLabelMap.WebtoolsInduceModelXMLFromDatabase}</a><br/>
-            </#if>
-            <#if packageNames?has_content>
-                <hr />
-                <div class="section-header">${uiLabelMap.WebtoolsEntityPackages}</div>
-                <#list packageNames as packageName>
-                    <#if forstatic>
-                        <a href="<@ofbizUrl>view/entityref_main?forstatic=true#${packageName}</@ofbizUrl>" target="entityFrame">${packageName}</a><br />
-                    <#else>
-                        <a href="<@ofbizUrl>view/entityref_main#${packageName}</@ofbizUrl>" target="entityFrame">${packageName}</a><br />
-                    </#if>
-                </#list>
-            </#if>
-            <#if entitiesList?has_content>
-                <hr />
-                <div class="section-header">${uiLabelMap.WebtoolsEntitiesAlpha}</div>
-                <#list entitiesList as entity>
-                    <#if forstatic>
-                        <a href="<@ofbizUrl>view/entityref_main?forstatic=true#${entity.entityName}</@ofbizUrl>" target="entityFrame">${entity.entityName}</a>
-                    <#else>
-                        <a href="<@ofbizUrl>view/entityref_main#${entity.entityName}${entity.url!}</@ofbizUrl>" target="entityFrame">${entity.entityName}</a>
-                    </#if>
-                    <br />
-                </#list>
-            </#if>
-        </div>
-    </body>
-</html>
Index: framework/webtools/webapp/webtools/entity/EntityRefMain.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntityRefMain.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/EntityRefMain.ftl	(nonexistent)
@@ -1,178 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<#assign docLangAttr = locale.toString()?replace("_", "-")>
-<#assign langDir = "ltr">
-<#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
-    <#assign langDir = "rtl">
-</#if>
-<#assign forstatic = false/>
-<#if (parameters.forstatic)?default("false") == "true">
-  <#assign forstatic = true/>
-</#if>
-<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>${uiLabelMap.WebtoolsEntityReference}</title>
-        <style type="text/css">
-           body, textarea, input, select {font-family: Helvetica, sans-serif; background-color: #ffffff;}
-          .packagetext {font-size: 18pt; font-weight: bold; text-align: center}
-          .toptext {font-size: 16pt; font-weight: bold; text-align: center}
-          .titletext {font-size: 12pt; font-weight: bold; color: blue;}
-          .headertext {font-size: 8pt; font-weight: bold; background-color: blue; color: white;}
-          .enametext {font-size: 8pt; font-weight: bold;}
-          .entityheader {font-size: 8pt; font-weight: bold; background-color: #cccccc; text-align: center}
-          .entityheader a {font-weight: normal;}
-          .entityheader a:hover {color:red;}
-          .entitytext {font-size: 8pt; background-color: #efffff;}
-          .relationtext {font-size: 8pt; background-color: #feeeee;}
-          .relationtext a {font-weight: bold; color: blue;}
-          .relationtext a:hover {color:red;}
-          .pktext {color:red;}
-          .descriptiontext {font-size: 8pt;}
-        </style>
-    </head>
-    <body>
-        <div class='toptext'>${uiLabelMap.WebtoolsEntityReferenceChart}<br />
-            ${numberOfEntities} ${uiLabelMap.WebtoolsTotalEntities}
-        </div>
-        <#assign numberShowed = 0>
-        <#list packagesList as package>
-            <hr /><div id='${package.packageName}' class='packagetext'>${package.packageName}</div><hr />
-            <#list package.entitiesList as entity>
-                <table width="95%" border="1" cellpadding='2' cellspacing='0'>
-                    <tr class='entityheader'>
-                        <td colspan="5">
-                            <div id='${entity.entityName}' class="titletext">
-                                ${uiLabelMap.WebtoolsEntity}: ${entity.entityName}
-                                <#if entity.plainTableName?has_content>  | ${uiLabelMap.WebtoolsTable}: ${entity.plainTableName}</#if>
-                            </div>
-                            <div>${entity.title}&nbsp;
-                                <#if !forstatic>
-                                    <a target='main' href="<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&amp;find=true&amp;VIEW_SIZE=50&amp;VIEW_INDEX=0</@ofbizUrl>">[${uiLabelMap.WebtoolsViewData}]</a>
-                                </#if>
-                                <#if !forstatic>
-                                    <a target='main' href="<@ofbizUrl>ArtifactInfo?name=${entity.entityName}&amp;type=entity</@ofbizUrl>">[${uiLabelMap.WebtoolsArtifactInfo}]</a>
-                                </#if>
-                            </div>
-                            <#if entity.description?has_content &&
-                                 !entity.description.equalsIgnoreCase("NONE") &&
-                                !entity.description.equalsIgnoreCase("")>
-                                   <div>${entity.description}</div>
-                            </#if>
-                            <#if entity.location?has_content>
-                                <div class='description'>${entity.location}</div>
-                            </#if>
-                        </td>
-                    </tr>
-                    <tr class='headertext'>
-                        <th width="30%">${uiLabelMap.WebtoolsJavaName}</th>
-                        <th width="30%">${uiLabelMap.WebtoolsDbName}</th>
-                        <th width="10%">${uiLabelMap.WebtoolsFieldType}</th>
-                        <th width="15%">${uiLabelMap.WebtoolsJavaType}</th>
-                        <th width="15%" nowrap="nowrap">${uiLabelMap.WebtoolsSqlType}</th>
-                    </tr>
-                    <#list entity.javaNameList as javaName>
-                        <tr class='entitytext'>
-                            <td>
-                              <div class='enametext<#if javaName.isPk> pktext</#if>'>${javaName.name}</div>
-                              <#if javaName.description?has_content>
-                                <div class="descriptiontext">${javaName.description}</div>
-                              </#if>
-                              <#if javaName.encrypted>
-                                <div class="descriptiontext">[${uiLabelMap.WebtoolsEncrypted}]</div>
-                              </#if>
-                            </td>
-                            <td>${javaName.colName}</td>
-                            <td>${javaName.type}</td>
-                            <#if javaName.javaType?has_content>
-                                <td>${javaName.javaType}</td>
-                                <td>${javaName.sqlType}</td>
-                            <#else>
-                                <td>${uiLabelMap.WebtoolsNotFound}</td>
-                                <td>${uiLabelMap.WebtoolsNotFound}</td>
-                            </#if>
-                        </tr>
-                    </#list>
-                    <#if entity.relationsList?has_content>
-                        <tr class='entityheader'>
-                            <td colspan="5"><hr /></td>
-                        </tr>
-                        <tr class='headertext'>
-                            <th>${uiLabelMap.WebtoolsRelation}</th>
-                            <th colspan='4'>${uiLabelMap.WebtoolsRelationType}</th>
-                        </tr>
-                        <#list entity.relationsList as relation>
-                            <tr class='relationtext'>
-                                <td>
-                                    <#if relation.title?has_content><b>${relation.title}</b> </#if><a href='#${relation.relEntity}'>${relation.relEntity}</a>
-                                    <#if relation.fkName?has_content>
-                                        <br />${uiLabelMap.WebtoolsFKName}: ${relation.fkName}
-                                    </#if>
-                                    <#if relation.description?has_content>
-                                        <br /><span class='descriptiontext'>${relation.description}</span>
-                                    </#if>
-                                </td>
-                                <td width="60%" colspan='4'>
-                                    ${relation.type}:
-                                    <#if relation.length == 3>
-                                        &nbsp;
-                                    </#if>
-                                    <#if relation.keysList?has_content>
-                                        <#list relation.keysList as keyList>
-                                            <br />&nbsp;&nbsp;${keyList.row})&nbsp;
-                                              <#if keyList.fieldName == keyList.relFieldName>
-                                                  ${keyList.fieldName}
-                                              <#else>
-                                                  ${keyList.fieldName} : ${keyList.relFieldName}
-                                              </#if>
-                                        </#list>
-                                    </#if>
-                                </td>
-                            </tr>
-                        </#list>
-                    </#if>
-                    <#if entity.indexList?has_content>
-                        <tr class='entityheader'>
-                            <td colspan="5"><hr /></td>
-                        </tr>
-                        <tr class='headertext'>
-                            <th>${uiLabelMap.WebtoolsIndexName}</th>
-                            <th colspan='4'>${uiLabelMap.WebtoolsIndexFieldList}</th>
-                        </tr>
-                        <#list entity.indexList as index>
-                            <tr class='relationtext'>
-                                <td>${index.name}</td>
-                                <td width="60%" colspan='4'>
-                                    <#list index.fieldNameList as fieldName>
-                                        ${fieldName}
-                                    </#list>
-                                </td>
-                            </tr>
-                        </#list>
-                    </#if>
-                </table>
-                <br />
-                <#assign numberShowed = numberShowed + 1>
-            </#list>
-        </#list>
-        <div align="center">
-            <br /><br />
-              ${uiLabelMap.WebtoolsEntityDisplayed}: ${numberShowed}
-        </div>
-    </body>
-</html>
Index: framework/webtools/webapp/webtools/entity/EntityRefReport.fo.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntityRefReport.fo.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/EntityRefReport.fo.ftl	(nonexistent)
@@ -1,208 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<#escape x as x?xml>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-size="8pt">
-  <fo:layout-master-set>
-    <fo:simple-page-master master-name="letter-portrait" page-height="11in" page-width="8.5in"
-        margin-top="0.5in" margin-bottom="0.5in" margin-left="0.5in" margin-right="0.25in">
-      <fo:region-body margin-top="1.5in" margin-bottom="1in"/>
-      <fo:region-before precedence="true" extent="1.5in"/>
-      <fo:region-after precedence="true" extent="0.5in"/>
-      </fo:simple-page-master>
-  </fo:layout-master-set>
-
-  <#-- bookmark section -->
-  <fo:bookmark-tree>
-    <#list packagesList as package>
-      <#assign packageName = package.packageName/>
-      <fo:bookmark internal-destination="${packageName}">
-        <fo:bookmark-title>${packageName}</fo:bookmark-title>
-        <#list package.entitiesList as entity>
-          <fo:bookmark internal-destination="${entity.entityName}">
-            <fo:bookmark-title>${entity.entityName}</fo:bookmark-title>
-          </fo:bookmark>
-        </#list>
-      </fo:bookmark>
-    </#list>
-  </fo:bookmark-tree>
-
-  <#-- report section -->
-  <#list packagesList as package>
-    <#assign packageName = package.packageName/>
-    <#assign newPackage = true/>
-    <#list package.entitiesList as entity>
-
-      <fo:page-sequence master-reference="letter-portrait">
-        <#-- header -->
-        <fo:static-content flow-name="xsl-region-before">
-          <fo:block font-size="12pt" text-align="center">
-            ${uiLabelMap.WebtoolsEntityReference}
-          </fo:block>
-          <fo:block font-size="14pt" text-align="center" margin-bottom="14pt">
-            ${packageName}
-          </fo:block>
-          <fo:block font-size="14pt" text-align="center" margin-bottom="8pt">
-            ${entity.entityName}<#if entity.plainTableName?has_content> | ${uiLabelMap.WebtoolsTable}: ${entity.plainTableName}</#if>
-          </fo:block>
-          <#if entity.description?has_content && !entity.description.equalsIgnoreCase("NONE")>
-            <fo:block text-align="center" margin-bottom="8pt">${entity.description}</fo:block>
-          </#if>
-          <#if entity.location?has_content>
-            <fo:block text-align="center" margin-bottom="8pt">${entity.location}</fo:block>
-          </#if>
-        </fo:static-content>
-
-        <#-- footer -->
-        <fo:static-content flow-name="xsl-region-after">
-            <fo:block text-align="center" border-top="thin solid black">Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation</fo:block>
-            <fo:block text-align="center">${uiLabelMap.CommonPage} <fo:page-number/></fo:block>
-        </fo:static-content>
-
-        <#-- body -->
-        <fo:flow flow-name="xsl-region-body">
-          <#if newPackage>
-            <fo:block id="${packageName}"/>
-            <#assign newPackage = false/>
-          </#if>
-          <fo:block id="${entity.entityName}"/>
-          <#-- entity fields -->
-          <fo:table table-layout="fixed" width="100%" border-style="solid" border-collapse="collapse"
-                margin-bottom="14pt">
-              <fo:table-column column-width="27%"/>
-              <fo:table-column column-width="31%"/>
-              <fo:table-column column-width="9%"/>
-              <fo:table-column column-width="16%"/>
-              <fo:table-column column-width="17%"/>
-            <fo:table-header border-bottom-style="solid">
-              <fo:table-row font-weight="bold">
-                <fo:table-cell><fo:block>${uiLabelMap.WebtoolsJavaName}</fo:block></fo:table-cell>
-                <fo:table-cell><fo:block>${uiLabelMap.WebtoolsDbName}</fo:block></fo:table-cell>
-                <fo:table-cell><fo:block>${uiLabelMap.WebtoolsFieldType}</fo:block></fo:table-cell>
-                <fo:table-cell><fo:block>${uiLabelMap.WebtoolsJavaType}</fo:block></fo:table-cell>
-                <fo:table-cell><fo:block>${uiLabelMap.WebtoolsSqlType}</fo:block></fo:table-cell>
-              </fo:table-row>
-            </fo:table-header>
-            <fo:table-body>
-              <#list entity.javaNameList as javaName>
-                <fo:table-row>
-                  <fo:table-cell padding="2pt">
-                    <fo:block font-weight="bold">${javaName.name}<#if javaName.isPk> (pk)</#if></fo:block>
-                    <#if javaName.description?has_content>
-                      <fo:block>${javaName.description}</fo:block>
-                    </#if>
-                    <#if javaName.encrypted>
-                      <fo:block>[${uiLabelMap.WebtoolsEncrypted}]</fo:block>
-                    </#if>
-                  </fo:table-cell>
-                  <fo:table-cell padding="2pt">
-                    <fo:block>${javaName.colName}</fo:block>
-                  </fo:table-cell>
-                  <fo:table-cell padding="2pt">
-                    <fo:block>${javaName.type}</fo:block>
-                  </fo:table-cell>
-                  <fo:table-cell padding="2pt">
-                    <fo:block>${javaName.javaType?default(uiLabelMap.WebtoolsNotFound)}</fo:block>
-                  </fo:table-cell>
-                  <fo:table-cell padding="2pt">
-                    <fo:block>${javaName.sqlType?default(uiLabelMap.WebtoolsNotFound)}</fo:block>
-                  </fo:table-cell>
-                </fo:table-row>
-              </#list>
-            </fo:table-body>
-          </fo:table>
-          <#if entity.relationsList?has_content>
-            <#-- entity relations -->
-            <fo:table table-layout="fixed" width="100%" border-style="solid" border-collapse="collapse"
-                margin-bottom="14pt">
-              <fo:table-column column-width="proportional-column-width(1)"/>
-              <fo:table-column column-width="proportional-column-width(1)"/>
-              <fo:table-header border-bottom-style="solid">
-                <fo:table-row font-weight="bold">
-                  <fo:table-cell><fo:block>${uiLabelMap.WebtoolsRelation}</fo:block></fo:table-cell>
-                  <fo:table-cell><fo:block>${uiLabelMap.WebtoolsRelationType}</fo:block></fo:table-cell>
-                </fo:table-row>
-              </fo:table-header>
-              <fo:table-body>
-                <#list entity.relationsList as relation>
-                  <fo:table-row>
-                    <fo:table-cell padding="2pt">
-                      <fo:block font-weight="bold"><#if relation.title?has_content>${relation.title} </#if>${relation.relEntity}</fo:block>
-                      <#if relation.fkName?has_content>
-                        <fo:block>${uiLabelMap.WebtoolsFKName}: ${relation.fkName}</fo:block>
-                      </#if>
-                      <#if relation.description?has_content>
-                        <fo:block>${relation.description}</fo:block>
-                      </#if>
-                    </fo:table-cell>
-                    <fo:table-cell padding="2pt">
-                      <fo:block>
-                        ${relation.type}:
-                        <#if relation.keysList?has_content>
-                          <#list relation.keysList as keyList>
-                            ${keyList.row}
-                            <#if keyList.fieldName == keyList.relFieldName>
-                              ${keyList.fieldName}
-                            <#else>
-                              ${keyList.fieldName} : ${keyList.relFieldName}
-                            </#if>
-                          </#list>
-                        </#if>
-                      </fo:block>
-                    </fo:table-cell>
-                  </fo:table-row>
-                </#list>
-              </fo:table-body>
-            </fo:table>
-          </#if>
-          <#if entity.indexList?has_content>
-            <#-- entity indexes -->
-            <fo:table table-layout="fixed" width="100%" border-style="solid" border-collapse="collapse"
-                margin-bottom="14pt">
-              <fo:table-column column-width="proportional-column-width(1)"/>
-              <fo:table-column column-width="proportional-column-width(1)"/>
-              <fo:table-header border-bottom-style="solid">
-                <fo:table-row font-weight="bold">
-                  <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.WebtoolsIndexName}</fo:block></fo:table-cell>
-                  <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.WebtoolsIndexFieldList}</fo:block></fo:table-cell>
-                </fo:table-row>
-              </fo:table-header>
-              <fo:table-body>
-                <#list entity.indexList as index>
-                  <fo:table-row>
-                    <fo:table-cell padding="2pt">
-                      <fo:block font-weight="bold">${index.name}</fo:block>
-                    </fo:table-cell>
-                    <fo:table-cell padding="2pt">
-                      <fo:block>
-                        <#list index.fieldNameList as fieldName>
-                          ${fieldName}
-                        </#list>
-                      </fo:block>
-                    </fo:table-cell>
-                  </fo:table-row>
-                </#list>
-              </fo:table-body>
-            </fo:table>
-          </#if>
-        </fo:flow>
-      </fo:page-sequence>
-    </#list>
-  </#list>
-</fo:root>
-</#escape>
Index: framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl	(nonexistent)
@@ -1,53 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<div class="screenlet">
-  <div class="screenlet-title-bar">
-    <ul>
-      <li class="h3">${uiLabelMap.WebtoolsResults}</li>
-    </ul>
-    <br class="clear"/>
-  </div>
-  <div class="screenlet-body">
-    <#if resultMessage?has_content>
-      ${resultMessage}
-      <br />
-    </#if>
-
-    <#if columns?has_content>
-        <table class="basic-table hover-bar" cellspacing="0">
-            <tr class="header-row">
-            <#list columns as column>
-                <td>${column}</td>
-            </#list>
-            </tr>
-            <#if records?has_content>
-            <#assign alt_row = false>
-            <#list records as record>
-                <tr <#if alt_row> class="alternate-row"</#if> >
-                <#list record as field>
-                    <td>${field!}</td>
-                </#list>
-                </tr>
-                <#assign alt_row = !alt_row>
-            </#list>
-            </#if>
-        </table>
-    </#if>
-  </div>
-</div>
Index: framework/webtools/webapp/webtools/entity/FindGeneric.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/FindGeneric.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/FindGeneric.ftl	(nonexistent)
@@ -1,42 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-        <form method="post" action="<@ofbizUrl>FindGeneric?entityName=${entityName}</@ofbizUrl>">
-          <input type="hidden" name="find" value="true"/>
-          <input type="hidden" name="searchOptions_collapsed" value="true"/>
-          <table class="basic-table" cellspacing="0">
-            <tr class="header-row-2">
-              <td>${uiLabelMap.WebtoolsFieldName}</td>
-              <td>${uiLabelMap.WebtoolsPk}</td>
-              <td>${uiLabelMap.WebtoolsFieldType}</td>
-              <td>&nbsp;</td>
-            </tr>
-            <#list fieldList as field>
-                <tr>
-                    <td>${field.name}</td>
-                    <td><#if field.isPk == 'Y'>*</#if></td>
-                    <td>${field.javaType},&nbsp;${field.sqlType}</td>
-                    <td><input type="text" name="${field.name}" value="${field.param}" size="40"/></td>
-                </tr>
-            </#list>
-                <tr>
-                    <td colspan="3"><h3>${uiLabelMap.WebtoolsToFindAll} ${entityName}, ${uiLabelMap.WebtoolsLeaveAllEntriesBlank}</h3></td>
-                    <td><input type="submit" value="${uiLabelMap.CommonFind}"/></td>
-                </tr>
-            </table>
-        </form>
Index: framework/webtools/webapp/webtools/entity/ListGeneric.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/ListGeneric.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/ListGeneric.ftl	(nonexistent)
@@ -1,57 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-        <#if (arraySize > 0)>
-            <#assign commonUrl="FindGeneric?${curFindString}&amp;searchOptions_collapsed=${(parameters.searchOptions_collapsed)?default(\"false\")}&amp;"/>
-            <@htmlTemplate.nextPrev commonUrl=commonUrl listSize=arraySize viewSize=viewSize viewIndex=viewIndex highIndex=highIndex commonDisplaying=commonDisplaying/>
-        </#if>
-          <table class="basic-table hover-bar" cellspacing="0">
-            <tr class="header-row-2">
-                <td>&nbsp;</td>
-                <#list fieldList as field>
-                    <td>${field.name}</td>
-                </#list>
-            </tr>
-            <#if resultPartialList?has_content>
-                <#assign alt_row = false>
-                <#list records as record>
-                    <tr<#if alt_row> class="alternate-row"</#if>>
-                        <td class="button-col">
-                            <a href='<@ofbizUrl>ViewGeneric?${record.findString}</@ofbizUrl>'>${uiLabelMap.CommonView}</a>
-                        <#if hasDeletePermission == 'Y'>
-                            <a onclick="return confirm ('${uiLabelMap.WebtoolsConfirmDelete}')" href='<@ofbizUrl>UpdateGeneric?${record.findString}&amp;UPDATE_MODE=DELETE</@ofbizUrl>'>${uiLabelMap.CommonDelete}</a>
-                        </#if>
-                        </td>
-                        <#list fieldList as field>
-                            <td>${Static["org.ofbiz.base.util.UtilFormatOut"].makeString(record.fields.get(field.name))}</td>
-                            <#-- <td>${record.fields.get(field.name)!?string}</td> -->
-                        </#list>
-                    </tr>
-                    <#assign alt_row = !alt_row>
-                </#list>
-            <#else>
-                <tr>
-                    <td colspan="${columnCount}">
-                        <h2>${uiLabelMap.WebtoolsNoEntityRecordsFound} ${entityName}.</h2>
-                    </td>
-                </tr>
-            </#if>
-        </table>
-        <#if (arraySize > 0)>
-            <@htmlTemplate.nextPrev commonUrl=commonUrl listSize=arraySize viewSize=viewSize viewIndex=viewIndex  highIndex=highIndex />
-        </#if>
Index: framework/webtools/webapp/webtools/entity/ProgramExport.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/ProgramExport.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/ProgramExport.ftl	(nonexistent)
@@ -1,36 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<div class="screenlet">
-  <div class="screenlet">
-    <div class="screenlet-title-bar">
-      <h3>${uiLabelMap.WebtoolsEntityXMLRepresentation}</h3>
-    </div>
-    <div class="screenlet-body">
-      <p>
-      <#if xmlDoc?has_content>
-        ${Static["org.ofbiz.base.util.UtilXml"].writeXmlDocument(xmlDoc)?replace("\n", "<br />")?replace("    ", "&nbsp;&nbsp;&nbsp;&nbsp;")}
-      </#if>
-      </p>
-    </div>
-  </div>
-  <br class="clear"/>
-</div>
-
Index: framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/ViewGeneric.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/ViewGeneric.ftl	(nonexistent)
@@ -1,281 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<#assign enableEdit = parameters.enableEdit?default("false")>
-<script language="JavaScript" type="text/javascript">
-var numTabs=${(entity.getRelationsSize()+1)};
-function ShowTab(lname) {
-  for(inc=1; inc <= numTabs; inc++) {
-    // document.getElementById('area' + inc).className = (lname == 'tab' + inc) ? 'screenlet' : 'topcontainerhidden';
-    // style of topcontainerhidden 
-    // .topcontainerhidden { POSITION: absolute; VISIBILITY: hidden; }
-    var elem = document.getElementById('area' + inc);
-    if (lname == 'tab' + inc){
-      elem.className = 'screenlet';
-    }
-    else {
-      elem.className = 'topcontainerhidden';
-      elem.style.position = 'absolute';
-      elem.style.visibility = 'hidden';
-    }
-  }
-}
-</script>
-
-<div class="screenlet">
-  <div class="screenlet-title-bar">
-    <ul>
-      <li class="h3">${uiLabelMap.WebtoolsViewValue}</li>
-    </ul>
-    <br class="clear"/>
-  </div>
-  <div class="screenlet-body">
-    <h2>${uiLabelMap.WebtoolsForEntity}: ${entityName}</h2>
-    <h2>${uiLabelMap.WebtoolsWithPk}: ${findByPk}</h2>
-    <br />
-    <div class="button-bar">
-      <a href='<@ofbizUrl>FindGeneric?entityName=${entityName}&amp;find=true&amp;VIEW_SIZE=50&amp;VIEW_INDEX=0</@ofbizUrl>' class="buttontext">${uiLabelMap.WebtoolsBackToFindScreen}</a>
-      <#if enableEdit = "false">
-        <#if hasCreatePermission>
-          <a href='<@ofbizUrl>ViewGeneric?entityName=${entityName}&amp;enableEdit=true</@ofbizUrl>' class="buttontext create">${uiLabelMap.CommonCreateNew}</a>
-          <a href="<@ofbizUrl>ViewGeneric?${curFindString}&amp;enableEdit=true</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
-        </#if>
-        <#if value?has_content>
-          <#if hasDeletePermission>
-            <a href='<@ofbizUrl>UpdateGeneric?UPDATE_MODE=DELETE&amp;${curFindString}</@ofbizUrl>' class="buttontext delete">${uiLabelMap.WebtoolsDeleteThisValue}</a>
-          </#if>
-        </#if>
-      </#if>
-    </div>
-    <#if value?has_content>
-      <form name="relationForm">
-        <p><b>${uiLabelMap.CommonView}</b></p>
-        <select name="viewRelated" onchange="javascript:ShowTab(this.options[this.selectedIndex].value)">
-          <option value="tab1">${entityName}</option>
-          <#list relationFieldList as relation>
-            <option value="tab${(relation_index+2)}">${relation.title}${relation.relEntityName} (${relation.type})</option>
-          </#list>
-        </select>
-      </form>
-      <br />
-    </#if>
-    <div id="area1" class="screenlet">
-      <div class="screenlet-title-bar">
-        <h3>${uiLabelMap.WebtoolsEntityCurrentValue}</h3>
-      </div>
-      <#if value?has_content>
-        <#assign alt_row = false>
-        <table class="basic-table" cellspacing="0">
-          <#list fields as field>
-            <tr<#if alt_row> class="alternate-row"</#if>>
-              <td class="label">${field.name}</td>
-              <td>${field.value}</td>
-            </tr>
-            <#assign alt_row = !alt_row>
-          </#list>
-        </table>
-      <#else>
-        ${uiLabelMap.WebtoolsSpecifiedEntity1} ${entityName} ${uiLabelMap.WebtoolsSpecifiedEntity2}.
-      </#if>
-    </div>
-    <#if enableEdit = "true">
-      <#if hasUpdatePermission || hasCreatePermission>
-        <#assign alt_row = false>
-        <div id="area2" class="screenlet">
-          <div class="screenlet-title-bar">
-            <h3>${uiLabelMap.WebtoolsEntityEditValue}</h3>
-          </div>
-          <#if pkNotFound>
-            <p>${uiLabelMap.WebtoolsEntityName} ${entityName} ${uiLabelMap.WebtoolsWithPk} ${findByPk} ${uiLabelMap.WebtoolsSpecifiedEntity2}.</p>
-          </#if>
-          <form action='<@ofbizUrl>UpdateGeneric?entityName=${entityName}</@ofbizUrl>' method="post" name="updateForm">
-            <#assign showFields = true>
-            <#assign alt_row = false>
-            <table class="basic-table" cellspacing="0">
-              <#if value?has_content>
-                <#if hasUpdatePermission>
-                  <#if newFieldPkList?has_content>
-                    <input type="hidden" name="UPDATE_MODE" value="UPDATE"/>
-                    <#list newFieldPkList as field>
-                      <tr<#if alt_row> class="alternate-row"</#if>>
-                        <td class="label">${field.name}</td>
-                        <td>
-                          <input type="hidden" name="${field.name}" value="${field.value}"/>
-                          ${field.value}
-                        </td>
-                      </tr>
-                      <#assign alt_row = !alt_row>
-                    </#list>
-                  </#if>
-                <#else>
-                  ${uiLabelMap.WebtoolsEntityCreatePermissionError} ${entityName} ${plainTableName}
-                  <#assign showFields = false>
-                </#if>
-              <#else>
-                <#if hasCreatePermission>
-                  <#if newFieldPkList?has_content>
-                    <p>${uiLabelMap.WebtoolsYouMayCreateAnEntity}</p>
-                    <input type="hidden" name="UPDATE_MODE" value="CREATE"/>
-                    <#list newFieldPkList as field>
-                      <tr<#if alt_row> class="alternate-row"</#if>>
-                        <td class="label">${field.name}</td>
-                        <td>
-                          <#if field.fieldType == 'DateTime'>
-                            ${uiLabelMap.CommonFormatDateTime}<@htmlTemplate.renderDateTimeField name="${field.name}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
-                          <#elseif field.fieldType == 'Date'>
-                            ${uiLabelMap.CommonFormatDate}<@htmlTemplate.renderDateTimeField name="${field.name}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
-                          <#elseif field.fieldType == 'Time'>
-                            ${uiLabelMap.CommonFormatTime}<input type="text" size="6" maxlength="10" name="${field.name}" value="${field.value}" />
-                          <#elseif field.fieldType == 'Integer'>
-                            <input type="text" size="20" name="${field.name}" value="${field.value}" />
-                          <#elseif field.fieldType == 'Long'>
-                            <input type="text" size="20" name="${field.name}" value="${field.value}" />
-                          <#elseif field.fieldType == 'Double'>
-                            <input type="text" size="20" name="${field.name}" value="${field.value}" />
-                          <#elseif field.fieldType == 'Float'>
-                            <input type="text" size="20" name="${field.name}" value="${field.value}" />
-                          <#elseif field.fieldType == 'StringOneRow'>
-                            <input type="text" size="${field.stringLength}" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}" />
-                          <#elseif field.fieldType == 'String'>
-                            <input type="text" size="80" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}" />
-                          <#elseif field.fieldType == 'Textarea'>
-                            <textarea cols="60" rows="3" maxlength="${field.stringLength}" name="${field.name}">${field.value}</textarea>
-                          <#else>
-                            <input type="text" size="20" name="${field.name}" value="${field.value}" />
-                          </#if>
-                        </td>
-                      </tr>
-                      <#assign alt_row = !alt_row>
-                    </#list>
-                  </#if>
-                <#else>
-                  <p>${uiLabelMap.WebtoolsEntityCreatePermissionError} ${entityName} ${plainTableName}</p>
-                  <#assign showFields = false>
-                </#if>
-              </#if>
-              <#if showFields>
-                <#if newFieldNoPkList?has_content>
-                  <#assign alt_row = false>
-                  <#list newFieldNoPkList as field>
-                    <tr<#if alt_row> class="alternate-row"</#if>>
-                      <td class="label">${field.name}</td>
-                      <td>
-                        <#if field.fieldType == 'DateTime'>
-                          ${uiLabelMap.CommonFormatDateTime}<@htmlTemplate.renderDateTimeField name="${field.name}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
-                        <#elseif field.fieldType == 'Date'>
-                          ${uiLabelMap.CommonFormatDate}<@htmlTemplate.renderDateTimeField name="${field.name}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
-                        <#elseif field.fieldType == 'Time'>
-                          ${uiLabelMap.CommonFormatTime}<input type="text" size="6" maxlength="10" name="${field.name}" value="${field.value}" />
-                        <#elseif field.fieldType == 'Integer'>
-                          <input type="text" size="20" name="${field.name}" value="${field.value}" />
-                        <#elseif field.fieldType == 'Long'>
-                          <input type="text" size="20" name="${field.name}" value="${field.value}" />
-                        <#elseif field.fieldType == 'Double'>
-                          <input type="text" size="20" name="${field.name}" value="${field.value}" />
-                        <#elseif field.fieldType == 'Float'>
-                          <input type="text" size="20" name="${field.name}" value="${field.value}" />
-                        <#elseif field.fieldType == 'StringOneRow'>
-                          <input type="text" size="${field.stringLength}" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}" />
-                        <#elseif field.fieldType == 'String'>
-                          <input type="text" size="80" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}" />
-                        <#elseif field.fieldType == 'Textarea'>
-                          <textarea cols="60" rows="3" maxlength="${field.stringLength}" name="${field.name}">${field.value}</textarea>
-                        <#else>
-                          <input type="text" size="20" name="${field.name}" value="${field.value}" />
-                        </#if>
-                      </td>
-                    </tr>
-                    <#assign alt_row = !alt_row>
-                  </#list>
-                  <#if value?has_content>
-                    <#assign button = "${uiLabelMap.CommonUpdate}">
-                  <#else>
-                    <#assign button = "${uiLabelMap.CommonCreate}">
-                  </#if>
-                  <tr<#if alt_row> class="alternate-row"</#if>>
-                    <td>&nbsp;</td>
-                    <td>
-                      <input type="submit" name="Update" value="${button}" />
-                      <a href="<@ofbizUrl>ViewGeneric?${curFindString}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancel}</a>
-                    </td>
-                  </tr>
-                </#if>
-              </#if>
-            </table>
-          </form>
-        </div>
-      </#if>
-    </#if>
-    <#if relationFieldList?has_content>
-      <#list relationFieldList as relation>
-          <div id="area${(relation_index + 2)}" class="topcontainerhidden">
-            <div class="screenlet-title-bar">
-              <ul>
-                <li class="h3">${uiLabelMap.WebtoolsRelatedEntity}: ${relation.title}${relation.relatedTable} (${relation.type})</li>
-                <li><a href="<@ofbizUrl>FindGeneric?${relation.encodeRelatedEntityFindString}&amp;find=true</@ofbizUrl>">${uiLabelMap.CommonFind}</a></li>
-                <#if relation.valueRelated?has_content>
-                  <li><a href="<@ofbizUrl>ViewGeneric?${relation.encodeRelatedEntityFindString}</@ofbizUrl>">${uiLabelMap.CommonView}</a></li>
-                </#if>
-                <#if hasAllCreate || relCreate>
-                  <li><a href="<@ofbizUrl>ViewGeneric?${relation.encodeRelatedEntityFindString}&amp;enableEdit=true</@ofbizUrl>">${uiLabelMap.CommonCreate}</a></li>
-                </#if>
-              </ul>
-              <br class="clear"/>
-            </div>
-            <#if relation.valueRelated?has_content>
-              <table class="basic-table" cellspacing="0">
-                <#assign alt_row = false>
-                <tr<#if alt_row> class="alternate-row"</#if>>
-                  <td class="label">${uiLabelMap.WebtoolsPk}</td>
-                  <td>${relation.valueRelatedPk}</td>
-                </tr>
-                <#list relation.relatedFieldsList as relatedField>
-                  <tr<#if alt_row> class="alternate-row"</#if>>
-                    <td class="label">${relatedField.name}</td>
-                    <td>${relatedField.value}</td>
-                  </tr>
-                  <#assign alt_row = !alt_row>
-                </#list>
-              </table>
-            <#else>
-              <#if "one" = relation.type>
-              <b>${uiLabelMap.WebtoolsNoValueFoundFor}</b> ${relation.title}${relation.relatedTable}.
-              <#else/>
-              <a href="<@ofbizUrl>FindGeneric?${relation.encodeRelatedEntityFindString}&amp;find=true</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonFind}</a>
-              </#if>
-            </#if>
-          </div>
-      </#list>
-    </#if>
-  </div>
-  <div class="screenlet">
-    <div class="screenlet-title-bar">
-      <h3>${uiLabelMap.WebtoolsEntityXMLRepresentation}</h3>
-    </div>
-    <div class="screenlet-body">
-      <p>
-      <#if value?has_content>
-        <#assign valueXmlDoc = Static["org.ofbiz.entity.GenericValue"].makeXmlDocument([value]) />
-        ${Static["org.ofbiz.base.util.UtilXml"].writeXmlDocument(valueXmlDoc)?replace("\n", "<br />")?replace("    ", "&nbsp;&nbsp;&nbsp;&nbsp;")}
-      </#if>
-      </p>
-    </div>
-  </div>
-  <br class="clear"/>
-</div>
Index: framework/webtools/webapp/webtools/entity/ViewRelations.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/ViewRelations.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/ViewRelations.ftl	(nonexistent)
@@ -1,63 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<div class="screenlet">
-  <div class="screenlet-title-bar">
-    <ul>
-      <li class="h3">${uiLabelMap.WebtoolsRelations}</li>
-    </ul>
-    <br class="clear"/>
-  </div>
-  <div class="screenlet-body">
-    <#if hasViewPermission>
-        <br />
-        <h2>${uiLabelMap.WebtoolsForEntity}: ${entityName}</h2>
-        <br />
-        <div class="button-bar">
-            <a href="<@ofbizUrl>FindGeneric?entityName=${entityName}&amp;find=true&amp;VIEW_SIZE=50&amp;VIEW_INDEX=0</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsBackToFindScreen}</a>
-        </div>
-        <br />
-        <table class="basic-table hover-bar" cellspacing="0">
-            <tr class="header-row">
-                <td>${uiLabelMap.WebtoolsTitle}</td>
-                <td>${uiLabelMap.WebtoolsRelatedEntity}</td>
-                <td>${uiLabelMap.WebtoolsRelationType}</td>
-                <td>${uiLabelMap.WebtoolsFKName}</td>
-                <td>${uiLabelMap.WebtoolsFieldsList}</td>
-            </tr>
-            <#assign alt_row = false>
-            <#list relations as relation>
-                <tr<#if alt_row> class="alternate-row"</#if>>
-                    <td>${relation.title}</td>
-                    <td class="button-col"><a href='<@ofbizUrl>FindGeneric?entityName=${relation.relEntityName}&amp;find=true&amp;VIEW_SIZE=50&amp;VIEW_INDEX=0</@ofbizUrl>'>${relation.relEntityName}</a></td>
-                    <td>${relation.type}</td>
-                    <td>${relation.fkName}</td>
-                    <td>
-                        <#list relation.relFields as field>
-                            ${field.fieldName} -> ${field.relFieldName}<br />
-                        </#list>
-                    </td>
-                </tr>
-                <#assign alt_row = !alt_row>
-            </#list>
-        </table>
-    <#else>
-        <h3>${uiLabelMap.WebtoolsEntityCreatePermissionError} ${entityName} ${plainTableName}.</h3>
-    </#if>
-  </div>
-</div>
Index: framework/webtools/webapp/webtools/entity/xmldsdump.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/xmldsdump.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/entity/xmldsdump.ftl	(nonexistent)
@@ -1,130 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<#if tobrowser?? && tobrowser>
-<h1>${uiLabelMap.WebtoolsExportFromDataSource}</h1>
-<br />
-<p>This page can be used to export data from the database. The exported documents will have a root tag of "&lt;entity-engine-xml&gt;".</p>
-<hr />
-<#if security.hasPermission("ENTITY_MAINT", session)>
-    <a href="<@ofbizUrl>xmldsrawdump</@ofbizUrl>" class="buttontext" target="_blank">Click Here to Get Data (or save to file)</a>
-<#else>
-    <div>You do not have permission to use this page (ENTITY_MAINT needed)</div>
-</#if>
-<#else>
-<#macro displayButtonBar>
-  <div class="button-bar">
-    <input type="submit" value="${uiLabelMap.WebtoolsExport}"/>
-    <a href="<@ofbizUrl>xmldsdump?checkAll=true</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsCheckAll}</a>
-    <a href="<@ofbizUrl>xmldsdump</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsUnCheckAll}</a>
-  </div>
-</#macro>
-
-<div class="page-title"><span>${uiLabelMap.PageTitleEntityExport}</span></div>
-<p>${uiLabelMap.WebtoolsXMLExportInfo}</p>
-<hr />
-
-<#if security.hasPermission("ENTITY_MAINT", session)>
-  <h2>${uiLabelMap.WebtoolsResults}:</h2>
-  <#if parameters.filename?has_content && (numberOfEntities?number > 0)>
-    <p>${uiLabelMap.WebtoolsWroteXMLForAllDataIn}</p>
-    <p>${uiLabelMap.WebtoolsWroteNRecordsToXMLFile}</p>
-  <#elseif parameters.outpath?has_content && (numberOfEntities?number > 0)>
-    <#list results as result>
-      <p>${result}</p>
-    </#list>
-  <#else>
-    <p>${uiLabelMap.WebtoolsNoFilenameSpecified}</p>
-  </#if>
-
-  <hr />
-
-  <h2>${uiLabelMap.WebtoolsExport}:</h2>
-  <form method="post" action="<@ofbizUrl>xmldsdump</@ofbizUrl>" name="entityExport">
-    <table class="basic-table">
-      <tr>
-        <td class="label">${uiLabelMap.WebtoolsOutputDirectory}</td>
-        <td><input type="text" size="60" name="outpath" value="${parameters.outpath!}"/></td>
-      </tr>
-      <tr>
-        <td class="label">${uiLabelMap.WebtoolsMaxRecordsPerFile}</td>
-        <td><input type="text" size="10" name="maxrecords"/></td>
-      </tr>
-      <tr>
-        <td class="label">${uiLabelMap.WebtoolsSingleFilename}</td>
-        <td><input type="text" size="60" name="filename" value="${parameters.filename!}"/></td>
-      </tr>
-      <tr>
-        <td class="label">${uiLabelMap.WebtoolsRecordsUpdatedSince}</td>
-        <td>
-        <@htmlTemplate.renderDateTimeField name="entityFrom" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="entityFrom1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
-        </td>
-      </tr>
-      <tr>
-        <td class="label">${uiLabelMap.WebtoolsRecordsUpdatedBefore} </td>
-        <td>
-            <@htmlTemplate.renderDateTimeField name="entityThru" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="entityThru1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
-        </td>
-      </tr>
-      <tr>
-        <td class="label">${StringUtil.wrapString(uiLabelMap.WebtoolsOutToBrowser)}</td>
-        <td><input type="checkbox" name="tobrowser"<#if tobrowser?has_content> checked="checked"</#if> /></td>
-      </tr>
-    </table>
-    <br />
-    <p>${uiLabelMap.WebtoolsEntityNames}:</p>
-    <@displayButtonBar/>
-      <div>${uiLabelMap.WebtoolsEntitySyncDump}:
-        <input name="entitySyncId" size="30" value="${entitySyncId!}"/>
-      </div>
-      ${uiLabelMap.WebtoolsPreConfiguredSet}:
-      <select name="preConfiguredSetName">
-        <option value="">${uiLabelMap.CommonNone}</option>
-        <option value="CatalogExport">${uiLabelMap.WebtoolsPreConfiguredSet1}</option>
-        <option value="Product1">${uiLabelMap.WebtoolsPreConfiguredSet2}</option>
-        <option value="Product2">${uiLabelMap.WebtoolsPreConfiguredSet3}</option>
-        <option value="Product3">${uiLabelMap.WebtoolsPreConfiguredSet4}</option>
-        <option value="Product4">${uiLabelMap.WebtoolsPreConfiguredSet5}</option>
-      </select>
-      <br />
-
-      <table>
-        <tr>
-          <#assign entCount = 0>
-          <#assign checkAll = parameters.checkAll?default("false")>
-          <#list modelEntities as modelEntity>
-            <#if entCount % 3 == 0 && entCount != 0>
-              </tr><tr>
-            </#if>
-            <#assign entCount = entCount + 1>
-            <#assign check = checkAll/>
-            <#if checkAll == "true" && modelEntity.getClass().getName() == "org.ofbiz.entity.model.ModelViewEntity">
-                <#assign check = "false"/>
-            </#if>
-            <#assign curEntityName = modelEntity.getEntityName()/>
-            <td><input type="checkbox" name="entityName" value="${curEntityName}"<#if check="true"> checked="checked"</#if>/>${curEntityName}</td>
-          </#list>
-        </tr>
-      </table>
-
-      <@displayButtonBar/>
-    </form>
-<#else>
-    <div>${uiLabelMap.WebtoolsPermissionMaint}</div>
-</#if>
-</#if>
\ No newline at end of file
Index: framework/webtools/webapp/webtools/main.ftl
===================================================================
--- framework/webtools/webapp/webtools/main.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/main.ftl	(nonexistent)
@@ -1,120 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<div class="screenlet">
-  <div class="screenlet-title-bar">
-    <ul>
-      <li class="h3">${uiLabelMap.WebtoolsMainPage}</li>
-      <li class="disabled">${delegator.getDelegatorName()}</li>
-    </ul>
-    <br class="clear"/>
-  </div>
-  <div class="screenlet-body">
-    <#if !userLogin?has_content>
-      <div>${uiLabelMap.WebtoolsForSomethingInteresting}.</div>
-      <br />
-      <div>${uiLabelMap.WebtoolsNoteAntRunInstall}</div>
-      <br />
-      <div><a href="<@ofbizUrl>checkLogin</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></div>
-    </#if>
-    <#if userLogin?has_content>
-      <ul class="webToolList">
-        <li><h3>${uiLabelMap.WebtoolsCacheDebugTools}</h3></li>
-        <li><a href="<@ofbizUrl>FindUtilCache</@ofbizUrl>">${uiLabelMap.WebtoolsCacheMaintenance}</a></li>
-        <li><a href="<@ofbizUrl>LogConfiguration</@ofbizUrl>">${uiLabelMap.WebtoolsAdjustDebuggingLevels}</a></li>
-        <li><a href="<@ofbizUrl>LogView</@ofbizUrl>">${uiLabelMap.WebtoolsViewLog}</a></li>
-        <li><a href="<@ofbizUrl>ViewComponents</@ofbizUrl>">${uiLabelMap.WebtoolsViewComponents}</a></li>
-        <#if security.hasPermission("ARTIFACT_INFO_VIEW", session)>
-          <li><h3>${uiLabelMap.WebtoolsGeneralArtifactInfoTools}</h3></li>
-          <li><a href="<@ofbizUrl>ViewComponents</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsArtifactInfo}</a></li>
-          <li><a href="<@ofbizUrl>entityref</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsEntityReference} - ${uiLabelMap.WebtoolsEntityReferenceInteractiveVersion}</a></li>
-          <li><a href="<@ofbizUrl>ServiceList</@ofbizUrl>">${uiLabelMap.WebtoolsServiceReference}</a></li>
-        </#if>
-        <#if security.hasPermission("LABEL_MANAGER_VIEW", session)>
-          <li><h3>${uiLabelMap.WebtoolsLabelManager}</h3></li>
-          <li><a href="<@ofbizUrl>SearchLabels</@ofbizUrl>">${uiLabelMap.WebtoolsLabelManager}</a></li>
-        </#if>
-        <#if security.hasPermission("ENTITY_MAINT", session)>
-          <li><h3>${uiLabelMap.WebtoolsEntityEngineTools}</h3></li>
-          <li><a href="<@ofbizUrl>entitymaint</@ofbizUrl>">${uiLabelMap.WebtoolsEntityDataMaintenance}</a></li>
-          <li><a href="<@ofbizUrl>entityref</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsEntityReference} - ${uiLabelMap.WebtoolsEntityReferenceInteractiveVersion}</a></li>
-          <li><a href="<@ofbizUrl>entityref?forstatic=true</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsEntityReference} - ${uiLabelMap.WebtoolsEntityReferenceStaticVersion}</a></li>
-          <li><a href="<@ofbizUrl>entityrefReport</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsEntityReferencePdf}</a></li>
-          <li><a href="<@ofbizUrl>EntitySQLProcessor</@ofbizUrl>">${uiLabelMap.PageTitleEntitySQLProcessor}</a></li>
-          <li><a href="<@ofbizUrl>EntitySyncStatus</@ofbizUrl>">${uiLabelMap.WebtoolsEntitySyncStatus}</a></li>
-          <li><a href="<@ofbizUrl>view/ModelInduceFromDb</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsInduceModelXMLFromDatabase}</a></li>
-          <li><a href="<@ofbizUrl>EntityEoModelBundle</@ofbizUrl>">${uiLabelMap.WebtoolsExportEntityEoModelBundle}</a></li>
-          <li><a href="<@ofbizUrl>view/checkdb</@ofbizUrl>">${uiLabelMap.WebtoolsCheckUpdateDatabase}</a></li>
-          <li><a href="<@ofbizUrl>ConnectionPoolStatus</@ofbizUrl>">${uiLabelMap.ConnectionPoolStatus}</a></li>
-          <#-- want to leave these out because they are only working so-so, and cause people more problems that they solve, IMHO
-            <li><a href="<@ofbizUrl>view/EditEntity</@ofbizUrl>"  target="_blank">Edit Entity Definitions</a></li>
-            <li><a href="<@ofbizUrl>ModelWriter</@ofbizUrl>" target="_blank">Generate Entity Model XML (all in one)</a></li>
-            <li><a href="<@ofbizUrl>ModelWriter?savetofile=true</@ofbizUrl>" target="_blank">Save Entity Model XML to Files</a></li>
-          -->
-          <#-- not working right now anyway
-            <li><a href="<@ofbizUrl>ModelGroupWriter</@ofbizUrl>" target="_blank">Generate Entity Group XML</a></li>
-            <li><a href="<@ofbizUrl>ModelGroupWriter?savetofile=true</@ofbizUrl>" target="_blank">Save Entity Group XML to File</a></li>
-          -->
-          <#--
-            <li><a href="<@ofbizUrl>view/tablesMySql</@ofbizUrl>">MySQL Table Creation SQL</a></li>
-            <li><a href="<@ofbizUrl>view/dataMySql</@ofbizUrl>">MySQL Auto Data SQL</a></li>
-          -->
-          <li><h3>${uiLabelMap.WebtoolsEntityXMLTools}</h3></li>
-          <li><a href="<@ofbizUrl>xmldsdump</@ofbizUrl>">${uiLabelMap.PageTitleEntityExport}</a></li>
-          <li><a href="<@ofbizUrl>EntityExportAll</@ofbizUrl>">${uiLabelMap.PageTitleEntityExportAll}</a></li>
-          <li><a href="<@ofbizUrl>EntityImport</@ofbizUrl>">${uiLabelMap.PageTitleEntityImport}</a></li>
-          <li><a href="<@ofbizUrl>EntityImportDir</@ofbizUrl>">${uiLabelMap.PageTitleEntityImportDir}</a></li>
-          <li><a href="<@ofbizUrl>EntityImportReaders</@ofbizUrl>">${uiLabelMap.PageTitleEntityImportReaders}</a></li>
-        </#if>
-        <#if security.hasPermission("SERVICE_MAINT", session)>
-          <li><h3>${uiLabelMap.WebtoolsServiceEngineTools}</h3></li>
-          <li><a href="<@ofbizUrl>ServiceList</@ofbizUrl>">${uiLabelMap.WebtoolsServiceReference}</a></li>
-          <li><a href="<@ofbizUrl>scheduleJob</@ofbizUrl>">${uiLabelMap.PageTitleScheduleJob}</a></li>
-          <li><a href="<@ofbizUrl>runService</@ofbizUrl>">${uiLabelMap.PageTitleRunService}</a></li>
-          <li><a href="<@ofbizUrl>FindJob</@ofbizUrl>">${uiLabelMap.PageTitleJobList}</a></li>
-          <li><a href="<@ofbizUrl>threadList</@ofbizUrl>">${uiLabelMap.PageTitleThreadList}</a></li>
-          <li><a href="<@ofbizUrl>FindJobManagerLock</@ofbizUrl>">${uiLabelMap.PageTitleJobManagerLockList}</a></li>
-          <li><a href="<@ofbizUrl>ServiceLog</@ofbizUrl>">${uiLabelMap.WebtoolsServiceLog}</a></li>
-        </#if>
-        <#if security.hasPermission("DATAFILE_MAINT", session)>
-          <li><h3>${uiLabelMap.WebtoolsDataFileTools}</h3></li>
-          <li><a href="<@ofbizUrl>viewdatafile</@ofbizUrl>">${uiLabelMap.WebtoolsWorkWithDataFiles}</a></li>
-        </#if>
-        <li><h3>${uiLabelMap.WebtoolsMiscSetupTools}</h3></li>
-        <#if security.hasPermission("PORTALPAGE_ADMIN", session)>
-          <li><a href="<@ofbizUrl>FindGeo</@ofbizUrl>">${uiLabelMap.WebtoolsGeoManagement}</a></li>
-          <li><a href="<@ofbizUrl>WebtoolsLayoutDemo</@ofbizUrl>">${uiLabelMap.WebtoolsLayoutDemo}</a></li>
-        </#if>
-        <#if security.hasPermission("ENUM_STATUS_MAINT", session)>
-          <#--
-          <li><a href="<@ofbizUrl>EditEnumerationTypes</@ofbizUrl>">Edit Enumerations</a></li>
-          <li><a href="<@ofbizUrl>EditStatusTypes</@ofbizUrl>">Edit Status Options</a></li>
-          -->
-        </#if>
-        <li><h3>${uiLabelMap.WebtoolsPerformanceTests}</h3></li>
-        <li><a href="<@ofbizUrl>EntityPerformanceTest</@ofbizUrl>">${uiLabelMap.WebtoolsEntityEngine}</a></li>
-        <#if security.hasPermission("SERVER_STATS_VIEW", session)>
-          <li><h3>${uiLabelMap.WebtoolsServerHitStatisticsTools}</h3></li>
-          <li><a href="<@ofbizUrl>StatsSinceStart</@ofbizUrl>">${uiLabelMap.WebtoolsStatsSinceServerStart}</a></li>
-        </#if>
-        <li><h3>${uiLabelMap.WebtoolsCertsX509}</h3></li>
-        <li><a href="<@ofbizUrl>myCertificates</@ofbizUrl>">${uiLabelMap.WebtoolsMyCertificates}</a></li>
-      </ul>
-    </#if>
-  </div>
-</div>
Index: framework/webtools/webapp/webtools/ping.ftl
===================================================================
--- framework/webtools/webapp/webtools/ping.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/ping.ftl	(nonexistent)
@@ -1,21 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-${requestAttributes._ERROR_MESSAGE_!}
-${requestAttributes.message!}
\ No newline at end of file
Index: framework/webtools/webapp/webtools/showDateTime.ftl
===================================================================
--- framework/webtools/webapp/webtools/showDateTime.ftl	(revision 1738254)
+++ framework/webtools/webapp/webtools/showDateTime.ftl	(nonexistent)
@@ -1,19 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()}
\ No newline at end of file